]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'dgoulet/bug24975_032_01' into maint-0.3.2
authorNick Mathewson <nickm@torproject.org>
Thu, 1 Feb 2018 13:10:34 +0000 (08:10 -0500)
committerNick Mathewson <nickm@torproject.org>
Thu, 1 Feb 2018 13:10:34 +0000 (08:10 -0500)

Trivial merge