From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 25 Jun 2010 22:56:15 +0000 (-0400)
Subject: Merge branch 'bug1526-v2'
X-Git-Tag: tor-0.2.2.14-alpha~14
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=faad8bd0e80807d47aa985599e737256105f2a44;p=thirdparty%2Ftor.git

Merge branch 'bug1526-v2'
---

faad8bd0e80807d47aa985599e737256105f2a44