commit 415caba967b9b470623ab29230b820b3470a91e6 Merge: 737228e c277519 Author: Nick Mathewson nickm@torproject.org Date: Tue Mar 15 17:20:41 2011 -0400

Merge remote branch 'arma/optimistic_server'

changes/prop174_server | 6 ++++++ src/or/connection.c | 19 ++++++++++++++++--- src/or/relay.c | 29 +++++++++++++++++++++++++---- 3 files changed, 47 insertions(+), 7 deletions(-)