]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'mintytoast/bug_19563'
authorNick Mathewson <nickm@torproject.org>
Thu, 3 Nov 2016 22:40:41 +0000 (18:40 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 3 Nov 2016 22:40:41 +0000 (18:40 -0400)

Trivial merge