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

[arma at torproject.org]

commit a7528bbf48515d8fcd3ef1d5a3d2bebae36a8e35
Merge: d082e28 5ed73e3
Author: Roger Dingledine <arma at torproject.org>
Date:   Mon Jan 24 18:14:19 2011 -0500

    Merge branch 'maint-0.2.2' into release-0.2.2

 changes/dhparam                 |    3 +++
 changes/policy_summarize-assert |    6 ++++++
 changes/routerparse_maxima      |    4 ++++
 src/common/crypto.c             |   34 ++++++++++++++++++++++++++++------
 src/common/crypto.h             |    5 ++++-
 src/common/tortls.c             |    2 +-
 src/or/onion.c                  |    4 ++--
 src/or/policies.c               |    4 ++--
 src/or/rendclient.c             |    2 +-
 src/or/rendservice.c            |    2 +-
 src/or/routerparse.c            |   17 +++++++++++++++++
 src/test/test_crypto.c          |    4 ++--
 12 files changed, 71 insertions(+), 16 deletions(-)