From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 27 Aug 2012 20:23:19 +0000 (-0400)
Subject: Merge remote-tracking branch 'mikeperry/bug6647'
X-Git-Tag: tor-0.2.4.1-alpha~31
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f40378118c711da6bf6d3ee2f247189306abad22;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'mikeperry/bug6647'
---

f40378118c711da6bf6d3ee2f247189306abad22