user/arma/tor, branch master Roger's Tor repository Merge remote branch 'origin/maint-0.2.2' 2011-03-09T21:22:50+00:00 Nick Mathewson nickm@torproject.org 2011-03-09T21:22:50+00:00 92e607d951c87bdc3e35d9bf3cfedcd0c39e9ae8 






oops. I got the bug number wrong.
2011-03-09T21:22:18+00:00

Nick Mathewson
nickm@torproject.org

2011-03-09T21:21:34+00:00

78d5955e5beee201087fc9af19190c964fafaed7












oops. I got the bug number wrong.
2011-03-09T21:21:34+00:00

Nick Mathewson
nickm@torproject.org

2011-03-09T21:21:34+00:00

dc0bb6b7094bdf5d11b8d9993f57506f5516787c












Merge remote branch 'origin/maint-0.2.2'
2011-03-09T21:20:14+00:00

Nick Mathewson
nickm@torproject.org

2011-03-09T21:20:14+00:00

19baca4837557cf25760fb80478bf3f9ad6822e1












openSUSE initscript create /var/run/tor fixes Ticket #2573
2011-03-09T21:18:44+00:00

Andreas Stieger
andreas.stieger@gmx.de

2011-03-09T20:41:25+00:00

f31ba6a3566e9f7bba827adfebe865c8179a06db

(changes file added by nickm)





(changes file added by nickm)







forward-port the 0.2.2.23-alpha changelog
2011-03-08T23:59:48+00:00

Roger Dingledine
arma@torproject.org

2011-03-08T23:59:48+00:00

b5f2b449ee590f9b1597ab2277a867a3edcf4b8f












Merge branch 'maint-0.2.2'
2011-03-08T23:16:27+00:00

Roger Dingledine
arma@torproject.org

2011-03-08T23:16:27+00:00

e569e6b201ddf43d2809a936edc76aaaa92693e4












Merge branch 'maint-0.2.1' into maint-0.2.2
2011-03-08T23:16:06+00:00

Roger Dingledine
arma@torproject.org

2011-03-08T23:16:06+00:00

6426cd14f37c2b24232f02d5c978313fab6a667f












move to march 2011 geoip file
2011-03-08T23:15:17+00:00

Roger Dingledine
arma@torproject.org

2011-03-08T23:15:17+00:00

d080fe8db14817e6eaf37359c638805909a306a1












Merge remote branch 'origin/maint-0.2.2'
2011-03-08T21:20:53+00:00

Nick Mathewson
nickm@torproject.org

2011-03-08T21:20:53+00:00

63651b919183e1b0a126109646030aca975344bd

Trivial conflicts fixed in or.h

Conflicts:
	src/or/or.h





Trivial conflicts fixed in or.h

Conflicts:
	src/or/or.h