commit 22f7042b9184d4463429072d788d52f4fc75e866 Merge: 4762118 3a7cee9 Author: Nick Mathewson nickm@torproject.org Date: Mon Mar 28 17:49:34 2011 -0400

Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2

changes/zlib_aint_openssl | 3 +++ configure.in | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-)