]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'dgoulet/bug24053_033_01'
authorNick Mathewson <nickm@torproject.org>
Mon, 6 Nov 2017 15:04:22 +0000 (10:04 -0500)
committerNick Mathewson <nickm@torproject.org>
Mon, 6 Nov 2017 15:04:22 +0000 (10:04 -0500)

Trivial merge