]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'origin/maint-0.2.2'
authorNick Mathewson <nickm@torproject.org>
Mon, 30 May 2011 20:14:45 +0000 (16:14 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 30 May 2011 20:14:45 +0000 (16:14 -0400)
1  2 
src/or/connection.c
src/or/router.c

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