From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 11 Oct 2013 16:51:15 +0000 (-0400)
Subject: Merge branch 'bug1376'
X-Git-Tag: tor-0.2.5.2-alpha~129
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0546edde66b3ca3dfbbd51f95b906d9e8f4f1459;p=thirdparty%2Ftor.git

Merge branch 'bug1376'
---

0546edde66b3ca3dfbbd51f95b906d9e8f4f1459