From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 23 Dec 2014 16:32:22 +0000 (-0500)
Subject: Merge branch 'ticket11016'
X-Git-Tag: tor-0.2.6.2-alpha~26
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9545569d73787211bf11355fe646e8918bdd19f0;p=thirdparty%2Ftor.git

Merge branch 'ticket11016'
---

9545569d73787211bf11355fe646e8918bdd19f0