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

[arma at torproject.org]

commit 2d4aebaf762f022a46932c9f56cbe8802d99c3da
Merge: 91b8bc2 30c06c1
Author: Roger Dingledine <arma at torproject.org>
Date:   Fri May 24 23:58:16 2013 -0400

    Merge branch 'maint-0.2.4' into release-0.2.4

 changes/bug5595            |    8 +
 changes/bug6026            |    4 +
 changes/bug7982            |    3 +
 changes/bug8093.part1      |    3 +
 changes/bug8253-fix        |    6 +
 changes/bug8711            |    6 +
 changes/bug8716            |    3 +
 changes/bug8719            |    6 +
 changes/bug8833            |    3 +
 changes/bug8844            |    6 +
 changes/bug8845            |    3 +
 changes/bug8846            |    4 +
 changes/bug8879            |    5 +
 changes/geoip-may2013      |    3 +
 changes/less_charbuf_usage |    5 +
 src/common/crypto.c        |   23 +
 src/common/crypto.h        |    4 +
 src/config/geoip           |20373 ++++++++++++++++++++++----------------------
 src/or/Makefile.nmake      |    1 +
 src/or/buffers.c           |    5 +-
 src/or/circuitbuild.c      |    4 +-
 src/or/config.c            |    6 +-
 src/or/connection.c        |    5 +-
 src/or/connection_edge.c   |    5 +-
 src/or/control.c           |    2 +-
 src/or/control.h           |    2 +-
 src/or/directory.c         |   73 +-
 src/or/dirserv.c           |  168 +-
 src/or/dirserv.h           |   25 +-
 src/or/dirvote.c           |  202 +-
 src/or/entrynodes.c        |    4 +-
 src/or/fp_pair.c           |  308 +
 src/or/fp_pair.h           |   45 +
 src/or/include.am          |    2 +
 src/or/networkstatus.c     |    9 +-
 src/or/or.h                |   38 +-
 src/or/relay.c             |   10 +-
 src/or/router.c            |  182 +-
 src/or/router.h            |    9 +-
 src/or/routerlist.c        |  516 +-
 src/or/routerlist.h        |   18 +-
 src/or/routerparse.c       |   74 +-
 src/or/routerparse.h       |    5 +-
 src/test/test.c            |   21 +-
 src/test/test_containers.c |   84 +
 src/test/test_crypto.c     |    2 +-
 src/test/test_dir.c        |  259 +-
 47 files changed, 11830 insertions(+), 10722 deletions(-)