From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 7 Jun 2010 15:22:16 +0000 (-0400)
Subject: Merge branch 'bug1522'
X-Git-Tag: tor-0.2.2.14-alpha~33
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2aa6fc5ae87985dd0555d98e545bdf2f83a93c49;p=thirdparty%2Ftor.git

Merge branch 'bug1522'
---

2aa6fc5ae87985dd0555d98e545bdf2f83a93c49