]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'dgoulet/bug16706_031_01'
authorNick Mathewson <nickm@torproject.org>
Mon, 10 Apr 2017 16:12:14 +0000 (12:12 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 10 Apr 2017 16:12:14 +0000 (12:12 -0400)

Trivial merge