Merge branch 'maint-0.3.4' into release-0.3.4
commitc0d1ba2e9488ad7af19688d5357a2b1437b3f816
authorNick Mathewson <nickm@torproject.org>
Mon, 29 Oct 2018 19:57:31 +0000 (29 15:57 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 29 Oct 2018 19:57:31 +0000 (29 15:57 -0400)
tree7b27efbea6400318b8f2ff1ed7a1753b4a7b4aa9
parenta7cd5cea6df23a4c639da8928e49862e6dd52419
parentc4b6b573880ba3f4806fed09e20ff384b556e277
Merge branch 'maint-0.3.4' into release-0.3.4