]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/636' into maint-0.3.5
authorNick Mathewson <nickm@torproject.org>
Wed, 9 Jan 2019 14:38:22 +0000 (09:38 -0500)
committerNick Mathewson <nickm@torproject.org>
Wed, 9 Jan 2019 14:38:22 +0000 (09:38 -0500)

Trivial merge