]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/670' into maint-0.3.5
authorNick Mathewson <nickm@torproject.org>
Fri, 8 Feb 2019 13:19:31 +0000 (08:19 -0500)
committerNick Mathewson <nickm@torproject.org>
Fri, 8 Feb 2019 13:19:31 +0000 (08:19 -0500)

Trivial merge