]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/683'
authorNick Mathewson <nickm@torproject.org>
Tue, 19 Feb 2019 16:32:33 +0000 (11:32 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 19 Feb 2019 16:32:33 +0000 (11:32 -0500)

Trivial merge