From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 11 May 2012 15:52:51 +0000 (-0400)
Subject: Merge remote-tracking branch 'asn/bug4865_take2'
X-Git-Tag: tor-0.2.3.16-alpha~81
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e0655708a20069a5f42476a25d62e9d3f8138d8c;p=thirdparty%2Ftor.git

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

e0655708a20069a5f42476a25d62e9d3f8138d8c