]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'ticket27344_029' into maint-0.2.9
authorNick Mathewson <nickm@torproject.org>
Fri, 7 Sep 2018 13:15:15 +0000 (09:15 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 7 Sep 2018 13:15:15 +0000 (09:15 -0400)

Trivial merge