From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 6 Nov 2012 22:53:45 +0000 (-0500)
Subject: Merge branch 'bug7195'
X-Git-Tag: tor-0.2.4.6-alpha~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b0688bbf49345cc294d2f4095c3ad11171a61f0e;p=thirdparty%2Ftor.git

Merge branch 'bug7195'
---

b0688bbf49345cc294d2f4095c3ad11171a61f0e