]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'teor/bug-15642-v3-fallback-unit-tests'
authorNick Mathewson <nickm@torproject.org>
Thu, 23 Apr 2015 13:22:16 +0000 (09:22 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 23 Apr 2015 13:22:16 +0000 (09:22 -0400)

Trivial merge