]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'bug22895_027' into maint-0.2.9
authorNick Mathewson <nickm@torproject.org>
Tue, 14 Nov 2017 01:35:59 +0000 (20:35 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 14 Nov 2017 01:35:59 +0000 (20:35 -0500)

Trivial merge