From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 7 Jan 2015 15:06:50 +0000 (-0500)
Subject: Merge branch 'bug9286_v3_squashed'
X-Git-Tag: tor-0.2.6.3-alpha~194
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cb54cd6745eaf15716aa357fc253f43f26c051a6;p=thirdparty%2Ftor.git

Merge branch 'bug9286_v3_squashed'
---

cb54cd6745eaf15716aa357fc253f43f26c051a6