]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/1596'
authorNick Mathewson <nickm@torproject.org>
Tue, 17 Dec 2019 14:39:50 +0000 (09:39 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 17 Dec 2019 14:39:50 +0000 (09:39 -0500)

Trivial merge