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

[nickm at torproject.org]

commit 4a3ef002e7d775cc41ac62ce91987770f35a3d77
Merge: 109ba37 4a22046
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon May 16 14:55:14 2011 -0400

    Merge branch 'maint-0.2.1' into release-0.2.1

 changes/check-fetched-rend-desc-service-id |    7 +++++++
 changes/check-public-key-exponents         |    5 +++++
 src/common/container.h                     |    2 +-
 src/common/crypto.c                        |   12 ++++++++++++
 src/common/crypto.h                        |    1 +
 src/common/di_ops.c                        |   14 +++++++-------
 src/common/di_ops.h                        |    1 +
 src/or/directory.c                         |    5 +++--
 src/or/dirvote.c                           |   10 ++++++----
 src/or/networkstatus.c                     |    5 +++--
 src/or/or.h                                |    3 ++-
 src/or/rendcommon.c                        |   22 +++++++++++++++++++++-
 src/or/routerlist.c                        |    9 +++++----
 src/or/routerparse.c                       |   17 +++++++++++++++++
 14 files changed, 91 insertions(+), 22 deletions(-)