]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'teor/ticket28318-035' into maint-0.3.5
authorNick Mathewson <nickm@torproject.org>
Wed, 7 Nov 2018 16:16:52 +0000 (11:16 -0500)
committerNick Mathewson <nickm@torproject.org>
Wed, 7 Nov 2018 16:16:52 +0000 (11:16 -0500)

Trivial merge