From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 8 Sep 2010 14:49:24 +0000 (-0400)
Subject: Merge branch 'bug1653'
X-Git-Tag: tor-0.2.2.16-alpha~26
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aa42f941dc58ff7554e31dc6f15e4d23f639f351;p=thirdparty%2Ftor.git

Merge branch 'bug1653'
---

aa42f941dc58ff7554e31dc6f15e4d23f639f351