]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'dgoulet/bug22032_031_01'
authorNick Mathewson <nickm@torproject.org>
Mon, 24 Apr 2017 13:30:30 +0000 (09:30 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 24 Apr 2017 13:30:30 +0000 (09:30 -0400)

Trivial merge