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

[arma at torproject.org]

commit 14e3900393106a7544df1e377db507b40f8e86f3
Merge: 30d0319 439fc70
Author: Roger Dingledine <arma at torproject.org>
Date:   Thu Apr 5 16:32:07 2012 -0400

    Merge branch 'maint-0.2.2' into release-0.2.2

 changes/bridgepassword            |   11 +
 changes/bug5090                   |    7 +
 changes/bug5340                   |    3 +
 changes/bug5342                   |    3 +
 changes/bug5343                   |    7 +
 changes/geoip-march2012           |    3 +
 changes/ides-becomes-turtles      |    4 +
 changes/safecookie                |    9 +
 doc/tor.1.txt                     |    7 +-
 src/common/OpenBSD_malloc_Linux.c |    5 +-
 src/common/crypto.c               |   68 +
 src/common/crypto.h               |    3 +
 src/common/util.c                 |   24 +-
 src/config/geoip                  |26743 +++++++++++++++++++++++++++----------
 src/or/circuitbuild.c             |    6 +-
 src/or/config.c                   |   24 +-
 src/or/connection.c               |    1 +
 src/or/control.c                  |  159 +-
 src/or/directory.c                |   12 +-
 src/or/or.h                       |   13 +-
 src/or/routerlist.c               |   23 +-
 src/test/test_crypto.c            |   71 +-
 22 files changed, 20403 insertions(+), 6803 deletions(-)