]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'teor/bug27461-029' into maint-0.2.9
authorNick Mathewson <nickm@torproject.org>
Fri, 7 Sep 2018 12:46:35 +0000 (08:46 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 7 Sep 2018 12:46:35 +0000 (08:46 -0400)

Trivial merge