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

[nickm at torproject.org]

commit c0fae841ec150930d1afc4260efa6dd942d7a260
Merge: fd105e1 e908e3a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon May 16 14:55:50 2011 -0400

    Merge branch 'maint-0.2.2' into release-0.2.2

 changes/bug2850                            |    5 ++++
 changes/check-fetched-rend-desc-service-id |    7 +++++
 changes/check-public-key-exponents         |    5 ++++
 src/common/crypto.c                        |   12 ++++++++++
 src/common/crypto.h                        |    1 +
 src/or/connection.c                        |   34 +++++++++++++++++++---------
 src/or/directory.c                         |    5 ++-
 src/or/rendcommon.c                        |   22 +++++++++++++++++-
 src/or/rendcommon.h                        |    3 +-
 src/or/routerparse.c                       |   17 ++++++++++++++
 10 files changed, 96 insertions(+), 15 deletions(-)