From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 19 Dec 2014 14:38:46 +0000 (-0500)
Subject: Merge remote-tracking branch 'dgoulet/bug13936_025_v2'
X-Git-Tag: tor-0.2.6.2-alpha~55
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=eee248bc593ab57cd905195458dd2b64c94e9ac1;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'dgoulet/bug13936_025_v2'
---

eee248bc593ab57cd905195458dd2b64c94e9ac1