]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/365'
authorNick Mathewson <nickm@torproject.org>
Fri, 21 Sep 2018 20:13:59 +0000 (16:13 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 21 Sep 2018 20:13:59 +0000 (16:13 -0400)

Trivial merge