]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/1367'
authorNick Mathewson <nickm@torproject.org>
Tue, 12 Nov 2019 17:18:14 +0000 (12:18 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 12 Nov 2019 17:18:14 +0000 (12:18 -0500)

Trivial merge