]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0b6fe3c 65520f1)
Merge remote-tracking branch 'teor/fallback-code-2018-01'
authorNick Mathewson <nickm@torproject.org>
Fri, 5 Jan 2018 21:47:28 +0000 (16:47 -0500)
committerNick Mathewson <nickm@torproject.org>
Fri, 5 Jan 2018 21:47:28 +0000 (16:47 -0500)

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