From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 29 Sep 2014 13:18:03 +0000 (-0400)
Subject: Merge branch 'bug12971_take2_squashed'
X-Git-Tag: tor-0.2.6.1-alpha~71
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=11ebbf5e88a55c15bdec0d16f0f60b24ee747fc9;p=thirdparty%2Ftor.git

Merge branch 'bug12971_take2_squashed'
---

11ebbf5e88a55c15bdec0d16f0f60b24ee747fc9