]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'bug24634' into maint-0.3.2
authorNick Mathewson <nickm@torproject.org>
Wed, 3 Jan 2018 15:08:36 +0000 (10:08 -0500)
committerNick Mathewson <nickm@torproject.org>
Wed, 3 Jan 2018 15:08:36 +0000 (10:08 -0500)

Trivial merge