]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'maint-0.2.2'
authorRoger Dingledine <arma@torproject.org>
Sun, 29 May 2011 23:11:07 +0000 (19:11 -0400)
committerRoger Dingledine <arma@torproject.org>
Sun, 29 May 2011 23:11:07 +0000 (19:11 -0400)
1  2 
src/or/circuitbuild.c
src/or/main.c

Simple merge
diff --cc src/or/main.c
Simple merge