From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 23 Apr 2015 13:09:33 +0000 (-0400)
Subject: Merge branch 'feature15652_squashed'
X-Git-Tag: tor-0.2.7.1-alpha~55
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3acee6142221839137607c9a9cbf8ca4feea5993;p=thirdparty%2Ftor.git

Merge branch 'feature15652_squashed'
---

3acee6142221839137607c9a9cbf8ca4feea5993