From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 22 Aug 2013 14:16:07 +0000 (-0400)
Subject: Merge branch 'bug6153_squashed'
X-Git-Tag: tor-0.2.5.1-alpha~59
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=eb79dd42e7de31dff636f67e94da055d94558401;p=thirdparty%2Ftor.git

Merge branch 'bug6153_squashed'
---

eb79dd42e7de31dff636f67e94da055d94558401