]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'teor/ticket27275-034' into maint-0.3.4
authorNick Mathewson <nickm@torproject.org>
Fri, 24 Aug 2018 00:07:39 +0000 (20:07 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 24 Aug 2018 00:07:39 +0000 (20:07 -0400)

Trivial merge