]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'dgoulet/bug24161_032_01' into maint-0.3.2
authorNick Mathewson <nickm@torproject.org>
Tue, 7 Nov 2017 19:00:18 +0000 (14:00 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 7 Nov 2017 19:00:18 +0000 (14:00 -0500)

Trivial merge