From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 5 Dec 2012 02:47:45 +0000 (-0500)
Subject: Merge remote-tracking branch 'asn/bug7592_take2'
X-Git-Tag: tor-0.2.4.7-alpha~22
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bd93ff8dd76b06ca3afe1f362b086d4f12639f71;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'asn/bug7592_take2'
---

bd93ff8dd76b06ca3afe1f362b086d4f12639f71