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

Merge branch 'block_renegotiate_024'
---

e8f547c181e9b86fa590280c579fd3be495824ce