From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 23 Apr 2014 15:05:54 +0000 (-0400)
Subject: Merge branch 'bug11156_issue2_squashed'
X-Git-Tag: tor-0.2.5.4-alpha~27
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=830492fbdaef92ecf82c5bfde9373a2a2d9157d3;p=thirdparty%2Ftor.git

Merge branch 'bug11156_issue2_squashed'
---

830492fbdaef92ecf82c5bfde9373a2a2d9157d3