]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/1329'
authorNick Mathewson <nickm@torproject.org>
Wed, 16 Oct 2019 16:31:47 +0000 (12:31 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 16 Oct 2019 16:31:47 +0000 (12:31 -0400)

Trivial merge