]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/1531'
authorNick Mathewson <nickm@torproject.org>
Thu, 14 Nov 2019 14:58:37 +0000 (09:58 -0500)
committerNick Mathewson <nickm@torproject.org>
Thu, 14 Nov 2019 14:58:37 +0000 (09:58 -0500)

Trivial merge