Merge branch 'maint-0.3.4' into release-0.3.4
commit79b40a910f5ab09e5a8b30950b84026066b8ec8e
authorNick Mathewson <nickm@torproject.org>
Tue, 20 Nov 2018 18:10:38 +0000 (20 13:10 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 20 Nov 2018 18:10:38 +0000 (20 13:10 -0500)
tree8cfa3203cbfef3d738a32f274770ff79faa182f5
parent8517e2d6e9cf1500a1cb531c3bcf49004045989e
parent9da8cd0bc35920bc1492efd3312d05f147fc7f7e
Merge branch 'maint-0.3.4' into release-0.3.4