# 2019-10-11 merge


## turbo-geth `HEAD`

commit 669c1e989aa01384a0eb9aae075c5a687d5d5fe0 (HEAD -> master, origin/master, origin/HEAD)
Merge: fa7916436 7039d7fa6
Author: Andrew Ashikhmin <34320705+yperbasis@users.noreply.github.com>
Date:   Wed Oct 9 16:28:40 2019 +0200

    Merge pull request #109 from ledgerwatch/rename

    Rename stuff in trie/structural_2.go. Fix some typos in Programmer's Guide

## geth `HEAD` (Geth v1.9.6 release tag)

commit bd05968077f27f7eb083404dd8448157996a8788 (tag: v1.9.6, upstream/release/1.9, upstream/elasa-196)
Author: Felix Lange <fjl@twurst.com>
Date:   Thu Oct 3 11:29:20 2019 +0200

    params: release Geth v1.9.6 stable