]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'public/bug22349_029' into maint-0.2.9
authorNick Mathewson <nickm@torproject.org>
Mon, 23 Oct 2017 12:46:26 +0000 (08:46 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 23 Oct 2017 12:46:26 +0000 (08:46 -0400)

Trivial merge