]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/1726/head'
authorNick Mathewson <nickm@torproject.org>
Wed, 12 Feb 2020 13:34:17 +0000 (08:34 -0500)
committerNick Mathewson <nickm@torproject.org>
Wed, 12 Feb 2020 13:34:17 +0000 (08:34 -0500)

Trivial merge