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

Trivial merge