]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/466'
authorNick Mathewson <nickm@torproject.org>
Tue, 6 Nov 2018 20:35:45 +0000 (15:35 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 6 Nov 2018 20:35:45 +0000 (15:35 -0500)

Trivial merge