From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 2 Aug 2012 19:45:10 +0000 (-0400)
Subject: Merge remote-tracking branch 'sysrqb/bug6518'
X-Git-Tag: tor-0.2.4.1-alpha~71
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=65d8448209633cb5f8f7804c309f537e8ac4b803;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'sysrqb/bug6518'
---

65d8448209633cb5f8f7804c309f537e8ac4b803