]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 472696e d5558f0)
Merge branch 'maint-0.2.4' into maint-0.2.5
authorRoger Dingledine <arma@torproject.org>
Fri, 25 Jul 2014 16:15:47 +0000 (12:15 -0400)
committerRoger Dingledine <arma@torproject.org>
Fri, 25 Jul 2014 16:15:47 +0000 (12:15 -0400)
Conflicts:
src/or/or.h


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