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

Trivial merge