]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/1120'
authorNick Mathewson <nickm@torproject.org>
Tue, 2 Jul 2019 17:33:37 +0000 (13:33 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 2 Jul 2019 17:33:37 +0000 (13:33 -0400)

Trivial merge