]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/1824/head'
authorNick Mathewson <nickm@torproject.org>
Fri, 20 Mar 2020 12:06:46 +0000 (08:06 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 20 Mar 2020 12:06:46 +0000 (08:06 -0400)

Trivial merge