]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/271'
authorNick Mathewson <nickm@torproject.org>
Wed, 7 Nov 2018 16:21:13 +0000 (11:21 -0500)
committerNick Mathewson <nickm@torproject.org>
Wed, 7 Nov 2018 16:21:13 +0000 (11:21 -0500)

Trivial merge