From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 6 Feb 2015 03:53:15 +0000 (-0500)
Subject: Merge remote-tracking branch 'public/bug13796'
X-Git-Tag: tor-0.2.6.3-alpha~73
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1799c2be09e7fabc1ff7cb98f0dcf73947c85319;p=thirdparty%2Ftor.git

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

1799c2be09e7fabc1ff7cb98f0dcf73947c85319