[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'

[nickm at torproject.org]

commit 03ccce6d776c617d81837ae9cc1f33f45d154e92
Merge: e423447 e908e3a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon May 16 14:50:53 2011 -0400

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

 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/directory.c                         |    5 +++--
 src/or/rendcommon.c                        |   22 +++++++++++++++++++++-
 src/or/rendcommon.h                        |    3 ++-
 src/or/routerparse.c                       |   17 +++++++++++++++++
 8 files changed, 68 insertions(+), 4 deletions(-)