]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'teor/ticket27449-034' into maint-0.3.4
authorNick Mathewson <nickm@torproject.org>
Wed, 5 Sep 2018 14:01:27 +0000 (10:01 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 5 Sep 2018 14:01:27 +0000 (10:01 -0400)

Trivial merge