]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'teor/bug28826-035' into maint-0.3.5
authorNick Mathewson <nickm@torproject.org>
Thu, 13 Dec 2018 13:22:01 +0000 (08:22 -0500)
committerNick Mathewson <nickm@torproject.org>
Thu, 13 Dec 2018 13:22:01 +0000 (08:22 -0500)

Trivial merge