]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'ticket28879' into maint-0.3.5
authorNick Mathewson <nickm@torproject.org>
Fri, 4 Jan 2019 02:34:35 +0000 (21:34 -0500)
committerNick Mathewson <nickm@torproject.org>
Fri, 4 Jan 2019 02:34:35 +0000 (21:34 -0500)

Trivial merge