From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 19 Jul 2012 21:52:21 +0000 (-0400)
Subject: Merge branch 'tickets_5529_5534_5974_6406'
X-Git-Tag: tor-0.2.4.1-alpha~84
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a4995d1507d93186bcfcdc4d3f61b8c91f7f75cc;p=thirdparty%2Ftor.git

Merge branch 'tickets_5529_5534_5974_6406'
---

a4995d1507d93186bcfcdc4d3f61b8c91f7f75cc