From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 25 Nov 2014 17:49:09 +0000 (-0500)
Subject: Merge branch 'feature9503_squashed'
X-Git-Tag: tor-0.2.6.2-alpha~76
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3a91a08e212ac125215b9aff5ad1ae4102623ab9;p=thirdparty%2Ftor.git

Merge branch 'feature9503_squashed'
---

3a91a08e212ac125215b9aff5ad1ae4102623ab9