From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 16 Jul 2015 19:48:41 +0000 (-0400)
Subject: Merge remote-tracking branch 'public/feature_16580'
X-Git-Tag: tor-0.2.7.2-alpha~25
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3d19eb71d2621ae749e5bfd6134b0d2c2250f58f;p=thirdparty%2Ftor.git

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

3d19eb71d2621ae749e5bfd6134b0d2c2250f58f