]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/1160'
authorNick Mathewson <nickm@torproject.org>
Mon, 19 Aug 2019 15:25:45 +0000 (11:25 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 19 Aug 2019 15:25:45 +0000 (11:25 -0400)

Trivial merge