commit 2c2c64287aebe9eaa844457b852ca7cd50c61ec5 Merge: 0dac0d8 1cc06bd Author: Nick Mathewson nickm@torproject.org Date: Fri Oct 19 14:32:22 2012 -0400

Merge remote-tracking branch 'origin/maint-0.2.3'

This is an "ours" commit ; I'm merging a separate version of the block-renegotiate patch into 0.2.4.