]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/1203'
authorNick Mathewson <nickm@torproject.org>
Tue, 6 Aug 2019 17:12:42 +0000 (13:12 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 6 Aug 2019 17:12:42 +0000 (13:12 -0400)

Trivial merge