From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 18 Sep 2014 19:31:08 +0000 (-0400)
Subject: Merge branch 'bug4244b_squashed'
X-Git-Tag: tor-0.2.6.1-alpha~108
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6d6e21a239deca137eb117eef49d3f875646a5fe;p=thirdparty%2Ftor.git

Merge branch 'bug4244b_squashed'
---

6d6e21a239deca137eb117eef49d3f875646a5fe