From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 1 Apr 2015 17:34:14 +0000 (-0400)
Subject: Merge remote-tracking branch 'yawning/feature15435'
X-Git-Tag: tor-0.2.7.1-alpha~92
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=aa7b7922505ef8dfab6df49f5537ffba92322b09;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'yawning/feature15435'
---

aa7b7922505ef8dfab6df49f5537ffba92322b09