]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'maint-0.3.4' into maint-0.3.5
authorNick Mathewson <nickm@torproject.org>
Fri, 2 Nov 2018 13:05:18 +0000 (09:05 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 2 Nov 2018 13:05:18 +0000 (09:05 -0400)

Trivial merge