From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 1 May 2014 16:34:59 +0000 (-0400)
Subject: Merge branch 'bug11654_squashed'
X-Git-Tag: tor-0.2.5.5-alpha~107
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a2b59dba71687b28546ccc99e98f1a6675ccdc91;p=thirdparty%2Ftor.git

Merge branch 'bug11654_squashed'
---

a2b59dba71687b28546ccc99e98f1a6675ccdc91