]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/530'
authorNick Mathewson <nickm@torproject.org>
Sat, 1 Dec 2018 16:28:22 +0000 (11:28 -0500)
committerNick Mathewson <nickm@torproject.org>
Sat, 1 Dec 2018 16:28:22 +0000 (11:28 -0500)

Trivial merge