]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/449'
authorNick Mathewson <nickm@torproject.org>
Fri, 2 Nov 2018 17:11:26 +0000 (13:11 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 2 Nov 2018 17:11:26 +0000 (13:11 -0400)

Trivial merge