From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 13 Jun 2014 12:40:59 +0000 (-0400)
Subject: Merge branch 'bug12191_squashed'
X-Git-Tag: tor-0.2.5.5-alpha~12
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cfca2a6037c139a82677a0ba2776d4ddf6ca6d04;p=thirdparty%2Ftor.git

Merge branch 'bug12191_squashed'
---

cfca2a6037c139a82677a0ba2776d4ddf6ca6d04