From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 17 Sep 2014 14:27:40 +0000 (-0400)
Subject: Merge remote-tracking branch 'public/ticket_13119_v3'
X-Git-Tag: tor-0.2.6.1-alpha~113
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=35156ffcc3a0b1a62df2affabd691349e880156f;p=thirdparty%2Ftor.git

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

35156ffcc3a0b1a62df2affabd691349e880156f