]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'dgoulet/bug23861_032_01' into maint-0.3.2
authorNick Mathewson <nickm@torproject.org>
Fri, 17 Nov 2017 14:23:04 +0000 (09:23 -0500)
committerNick Mathewson <nickm@torproject.org>
Fri, 17 Nov 2017 14:23:04 +0000 (09:23 -0500)

Trivial merge