]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6c4a26b 7760916)
Merge branch 'maint-0.2.5'
authorRoger Dingledine <arma@torproject.org>
Mon, 28 Jul 2014 08:14:39 +0000 (04:14 -0400)
committerRoger Dingledine <arma@torproject.org>
Mon, 28 Jul 2014 08:14:39 +0000 (04:14 -0400)
Conflicts:
configure.ac
contrib/win32build/tor-mingw.nsi.in
src/win32/orconfig.h


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