]> git.ipfire.org Git - thirdparty/tor.git/commit
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)
commit415caba967b9b470623ab29230b820b3470a91e6
tree089056c4c93a2ee8e8a0ff0b5bf1ec342f5afb00
parent737228ed8e81de6619a29bd039d08d959d4164da
parentc2775196f79b9dba70d517663004e1783873f35c
Merge remote branch 'arma/optimistic_server'
src/or/connection.c
src/or/relay.c