From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 14 Jun 2012 17:05:16 +0000 (-0400)
Subject: Merge remote-tracking branch 'asn-mytor/bug5589_take2'
X-Git-Tag: tor-0.2.3.17-beta~12
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4fdce6b091181f01295270eedb23ef7735904635;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'asn-mytor/bug5589_take2'
---

4fdce6b091181f01295270eedb23ef7735904635