]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote branch 'arma/optimistic_server'
authorNick Mathewson <nickm@torproject.org>
Tue, 15 Mar 2011 21:20:41 +0000 (17:20 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 15 Mar 2011 21:20:41 +0000 (17:20 -0400)
1  2 
src/or/connection.c
src/or/relay.c

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