From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 17 Jan 2013 14:23:07 +0000 (-0500)
Subject: Merge branch 'bug6826_squashed'
X-Git-Tag: tor-0.2.4.10-alpha~28
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=514d48459786eb5a88a657b23cbee3cc5b570ce4;p=thirdparty%2Ftor.git

Merge branch 'bug6826_squashed'
---

514d48459786eb5a88a657b23cbee3cc5b570ce4