]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'teor/fallbacks-201602-v2'
authorNick Mathewson <nickm@torproject.org>
Sun, 28 Feb 2016 14:51:22 +0000 (15:51 +0100)
committerNick Mathewson <nickm@torproject.org>
Sun, 28 Feb 2016 14:51:22 +0000 (15:51 +0100)

Trivial merge