]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/1307' into maint-0.3.5
authorNick Mathewson <nickm@torproject.org>
Tue, 17 Sep 2019 22:58:06 +0000 (18:58 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 17 Sep 2019 22:58:06 +0000 (18:58 -0400)

Trivial merge