]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d2cca82 a3f488a)
Merge branch 'maint-0.2.2'
authorRoger Dingledine <arma@torproject.org>
Thu, 30 Sep 2010 21:55:01 +0000 (17:55 -0400)
committerRoger Dingledine <arma@torproject.org>
Thu, 30 Sep 2010 21:55:01 +0000 (17:55 -0400)
Conflicts:

configure.in
contrib/tor-mingw.nsi.in
src/win32/orconfig.h


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