]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/279'
authorNick Mathewson <nickm@torproject.org>
Tue, 28 Aug 2018 19:24:30 +0000 (15:24 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 28 Aug 2018 19:24:30 +0000 (15:24 -0400)

Trivial merge