]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'pastly/ticket20459'
authorNick Mathewson <nickm@torproject.org>
Wed, 26 Oct 2016 20:22:06 +0000 (16:22 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 26 Oct 2016 20:22:06 +0000 (16:22 -0400)

Trivial merge