From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 12 Mar 2014 15:10:51 +0000 (-0400)
Subject: Merge remote-tracking branch 'asn/bug5018_notice'
X-Git-Tag: tor-0.2.5.3-alpha~21
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=df836b45b068ecf4116c7b56898a3786893bce82;p=thirdparty%2Ftor.git

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

df836b45b068ecf4116c7b56898a3786893bce82