From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 18 Mar 2015 18:27:00 +0000 (-0400)
Subject: Merge remote-tracking branch 'public/feature15053'
X-Git-Tag: tor-0.2.7.1-alpha~119
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=54d6e5e71e604ffedcb3c0a2aeff4b39bc9e37db;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'public/feature15053'
---

54d6e5e71e604ffedcb3c0a2aeff4b39bc9e37db