From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 8 Sep 2015 18:03:04 +0000 (-0400)
Subject: Merge branch 'feature15482_squashed'
X-Git-Tag: tor-0.2.7.3-rc~47
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fcec1f338110d17dd23668558a87f0f5ea8a8ee1;p=thirdparty%2Ftor.git

Merge branch 'feature15482_squashed'
---

fcec1f338110d17dd23668558a87f0f5ea8a8ee1