]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'github/bug27081_029' into maint-0.2.9
authorNick Mathewson <nickm@torproject.org>
Wed, 15 Aug 2018 16:20:53 +0000 (12:20 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 15 Aug 2018 16:20:53 +0000 (12:20 -0400)

Trivial merge