From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 15 Mar 2011 21:20:41 +0000 (-0400)
Subject: Merge remote branch 'arma/optimistic_server'
X-Git-Tag: tor-0.2.3.1-alpha~67
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=415caba967b9b470623ab29230b820b3470a91e6;p=thirdparty%2Ftor.git

Merge remote branch 'arma/optimistic_server'
---

415caba967b9b470623ab29230b820b3470a91e6