]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 56a2b8d 4181e81)
Merge remote-tracking branch 'teor/new-fallbacks-028-20161219' into maint-0.2.8
authorNick Mathewson <nickm@torproject.org>
Mon, 19 Dec 2016 12:27:39 +0000 (07:27 -0500)
committerNick Mathewson <nickm@torproject.org>
Mon, 19 Dec 2016 12:27:39 +0000 (07:27 -0500)

Trivial merge
Mirror of https://git.torproject.org/tor.git