]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tlyu-github/ticket28731-035' into maint-0.3.5
authorNick Mathewson <nickm@torproject.org>
Thu, 13 Dec 2018 23:57:00 +0000 (18:57 -0500)
committerNick Mathewson <nickm@torproject.org>
Thu, 13 Dec 2018 23:57:00 +0000 (18:57 -0500)

Trivial merge