]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/436' into maint-0.2.9
authorNick Mathewson <nickm@torproject.org>
Wed, 31 Oct 2018 15:01:36 +0000 (11:01 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 31 Oct 2018 15:01:36 +0000 (11:01 -0400)

Trivial merge