]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tvdw/fix-16563'
authorNick Mathewson <nickm@torproject.org>
Tue, 6 Oct 2015 14:57:31 +0000 (10:57 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 6 Oct 2015 14:57:31 +0000 (10:57 -0400)

Trivial merge