]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/1920/head'
authorNick Mathewson <nickm@torproject.org>
Fri, 5 Jun 2020 14:12:00 +0000 (10:12 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 5 Jun 2020 14:12:00 +0000 (10:12 -0400)

Trivial merge