From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 6 Sep 2012 15:05:16 +0000 (-0400)
Subject: Merge branch 'bug6778'
X-Git-Tag: tor-0.2.4.2-alpha~25
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ad1e8b45df3933e6f01098a5f9ba6238adafc9c2;p=thirdparty%2Ftor.git

Merge branch 'bug6778'
---

ad1e8b45df3933e6f01098a5f9ba6238adafc9c2