]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/531'
authorNick Mathewson <nickm@torproject.org>
Wed, 5 Dec 2018 14:02:49 +0000 (09:02 -0500)
committerNick Mathewson <nickm@torproject.org>
Wed, 5 Dec 2018 14:02:49 +0000 (09:02 -0500)

Trivial merge