[tor-commits] [tor/maint-0.3.3] Merge remote-tracking branch 'dgoulet/ticket24902_029_05' into maint-0.2.9

[nickm at torproject.org]

commit cb92d47deca15c44dd52cad6fc326520648c632e
Merge: 2b99350ca e7f631478
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Feb 16 09:41:06 2018 -0500

    Merge remote-tracking branch 'dgoulet/ticket24902_029_05' into maint-0.2.9

 changes/bug24952            |   5 +
 changes/bug25223            |   4 +
 changes/ticket24902         |  13 +
 changes/ticket25122         |   4 +
 changes/ticket25202         |   4 +
 doc/tor.1.txt               |  95 ++++++
 src/common/address.c        |  27 +-
 src/common/address.h        |   2 +
 src/common/address_set.c    | 129 +++++++
 src/common/address_set.h    |  35 ++
 src/common/include.am       |   2 +
 src/common/log.c            |   2 +-
 src/common/torlog.h         |   4 +-
 src/or/channel.c            |   9 +-
 src/or/channel.h            |   3 +-
 src/or/channeltls.c         |   2 +-
 src/or/command.c            |  13 +
 src/or/config.c             |  25 ++
 src/or/connection.c         |  16 +
 src/or/dos.c                | 794 ++++++++++++++++++++++++++++++++++++++++++++
 src/or/dos.h                | 140 ++++++++
 src/or/geoip.c              | 205 ++++++++++--
 src/or/geoip.h              |  29 ++
 src/or/include.am           |   2 +
 src/or/main.c               |   2 +
 src/or/networkstatus.c      |  13 +-
 src/or/nodelist.c           |  78 +++++
 src/or/nodelist.h           |   3 +
 src/or/or.h                 |  33 ++
 src/or/relay.c              |  16 +-
 src/or/rendmid.c            |  12 +
 src/or/status.c             |   2 +
 src/test/include.am         |   2 +
 src/test/test.c             |  20 ++
 src/test/test.h             |   2 +
 src/test/test_address_set.c | 174 ++++++++++
 src/test/test_dos.c         | 497 +++++++++++++++++++++++++++
 37 files changed, 2372 insertions(+), 46 deletions(-)