From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 19 Oct 2012 18:32:22 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/maint-0.2.3'
X-Git-Tag: tor-0.2.4.4-alpha~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2c2c64287aebe9eaa844457b852ca7cd50c61ec5;p=thirdparty%2Ftor.git

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.
---

2c2c64287aebe9eaa844457b852ca7cd50c61ec5