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

[arma at torproject.org]

commit 49cda713f893a18501a35a5b74ce5504dcccd2c4
Merge: a2fe17b 50c259d
Author: Roger Dingledine <arma at torproject.org>
Date:   Fri Feb 11 00:59:34 2011 -0500

    Merge branch 'maint-0.2.1' into release-0.2.1

 changes/bug2408                 |    6 +
 changes/bug2470                 |    5 +
 changes/dhparam                 |    3 +
 changes/geoip-feb2011           |    3 +
 changes/policy_summarize-assert |    6 +
 changes/routerparse_maxima      |    4 +
 contrib/tor-exit-notice.html    |   84 +-
 doc/tor.1.in                    |    2 +-
 src/common/crypto.c             |   34 +-
 src/common/crypto.h             |    5 +-
 src/common/tortls.c             |    2 +-
 src/config/geoip                | 5232 +++++++++++++++++++++++++--------------
 src/or/config.c                 |   12 +-
 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/or/test.c                   |    4 +-
 19 files changed, 3548 insertions(+), 1883 deletions(-)