[tor-commits] [tor/release-0.2.3] Merge remote-tracking branch 'origin/maint-0.2.3' into release-0.2.3

[nickm at torproject.org]

commit 43836f6f0ab7c25b0c8c9fab366ec664ebd0b0ee
Merge: e318ab1 c1c83eb
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sun Oct 19 14:35:29 2014 -0400

    Merge remote-tracking branch 'origin/maint-0.2.3' into release-0.2.3

 changes/bug10849_023                  |    6 +
 changes/bug11464_023                  |    5 +
 changes/bug11519                      |    3 +
 changes/bug13100                      |    3 +
 changes/bug5650                       |    5 +
 changes/bug6979                       |    4 +
 changes/bug7164_downgrade             |    6 +
 changes/bug8844                       |    6 +
 changes/bug9002                       |    4 +
 changes/bug9017                       |    6 +
 changes/bug9063                       |    3 +
 changes/bug9063_redux                 |   15 +
 changes/bug9072                       |    3 +
 changes/bug9093                       |    7 +
 changes/bug9546                       |   11 +
 changes/bug9564                       |    5 +
 changes/bug9671_023                   |    5 +
 changes/bug9928                       |    6 +
 changes/disable_sslv3                 |    4 +
 changes/geoip-august2013              |    3 +
 changes/geoip-august2014              |    3 +
 changes/geoip-february2014            |    3 +
 changes/geoip-february2014-regcountry |    3 +
 changes/geoip-july2013                |    3 +
 changes/geoip-july2014                |    3 +
 changes/geoip-june2013                |    3 +
 changes/geoip-may2013                 |    3 +
 changes/geoip-october2013             |    3 +
 changes/geoip-september2013           |    3 +
 changes/md_leak_bug                   |    5 +
 doc/tor.1.txt                         |    9 +
 src/common/mempool.h                  |    2 +
 src/common/tortls.c                   |    4 +-
 src/common/util.c                     |   12 +-
 src/config/geoip                      |134839 ++++++++-------------------------
 src/or/buffers.c                      |    3 +-
 src/or/circuitbuild.c                 |    2 +-
 src/or/circuitbuild.h                 |    1 +
 src/or/circuitlist.c                  |  138 +
 src/or/circuitlist.h                  |    1 +
 src/or/circuituse.c                   |    6 +-
 src/or/command.c                      |   14 +-
 src/or/config.c                       |   13 +-
 src/or/connection.c                   |   17 +-
 src/or/connection_edge.c              |   11 +-
 src/or/connection_or.c                |    9 +-
 src/or/microdesc.c                    |    2 +-
 src/or/networkstatus.c                |   13 +-
 src/or/or.h                           |   24 +
 src/or/relay.c                        |   69 +-
 src/or/relay.h                        |    1 +
 src/or/rendcommon.c                   |   28 +-
 src/or/router.c                       |    2 +-
 src/or/routerlist.c                   |   31 +
 src/or/routerlist.h                   |    1 +
 src/or/routerparse.c                  |   10 +
 src/test/test.c                       |   12 +
 src/test/test_util.c                  |    1 +
 58 files changed, 31431 insertions(+), 103986 deletions(-)