]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'maint-0.3.4' into release-0.3.4
authorNick Mathewson <nickm@torproject.org>
Tue, 8 Jan 2019 02:18:47 +0000 (21:18 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 8 Jan 2019 02:18:47 +0000 (21:18 -0500)

Trivial merge