[or-cvs] [tor/release-0.2.2] Merge branch 'bug2324_uncompress' into maint-0.2.1

[arma at torproject.org]

commit 8f11642ceb357c7ff057335f14c37c3f7b33644f
Merge: 50b06a2 1fcfc18
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sat Jan 15 12:12:34 2011 -0500

    Merge branch 'bug2324_uncompress' into maint-0.2.1

 changes/bug2324_uncompress |    5 +++
 src/common/torgzip.c       |   60 ++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 63 insertions(+), 2 deletions(-)