]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'teor/broken-028-fallbacks' into maint-0.2.8
authorNick Mathewson <nickm@torproject.org>
Fri, 23 Sep 2016 13:29:55 +0000 (09:29 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 23 Sep 2016 13:29:55 +0000 (09:29 -0400)

Trivial merge