[tor-commits] [tor/release-0.2.1] Merge branch 'maint-0.2.1' into release-0.2.1

[arma at torproject.org]

commit 7c29b6996ee315cf2d8fdd6fe53b47512174be77
Merge: c55f586 c5a3664
Author: Roger Dingledine <arma at torproject.org>
Date:   Wed Oct 26 07:39:01 2011 -0400

    Merge branch 'maint-0.2.1' into release-0.2.1

 changes/bug1526      |    3 +++
 src/common/torgzip.c |   32 +++++++++++++++++++++++++++-----
 2 files changed, 30 insertions(+), 5 deletions(-)