From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 29 Jun 2012 04:43:59 +0000 (-0400)
Subject: Merge branch 'bug6255'
X-Git-Tag: tor-0.2.4.1-alpha~100
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ed2601f2be0978c37c0ae086b2a8d2f7d94078fc;p=thirdparty%2Ftor.git

Merge branch 'bug6255'
---

ed2601f2be0978c37c0ae086b2a8d2f7d94078fc