]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f7ed4a7 884b371)
Merge branch 'maint-0.2.5' into maint-0.2.6
authorNick Mathewson <nickm@torproject.org>
Tue, 28 Feb 2017 15:25:51 +0000 (10:25 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 28 Feb 2017 15:25:51 +0000 (10:25 -0500)
"ours" merge to avoid version bumps


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