[tor-commits] [tor/master] Merge branch 'maint-0.3.2' of https://git.torproject.org/tor into maint-0.3.2

[nickm at torproject.org]

commit 9c83cd1993b6ed98301020e5a170df9d5427a1e6
Merge: 6fed66d26 5a8827a4c
Author: David Goulet <dgoulet at torproject.org>
Date:   Tue Sep 11 15:36:48 2018 -0400

    Merge branch 'maint-0.3.2' of https://git.torproject.org/tor into maint-0.3.2

 .travis.yml                         |   267 +-
 Makefile.am                         |     3 +-
 changes/27286                       |     4 +
 changes/bug20424_029_minimal        |     4 +
 changes/bug25440                    |     5 +
 changes/bug26269                    |     5 +
 changes/bug26485                    |     4 +
 changes/bug26497                    |     3 +
 changes/bug26497-backport           |     3 +
 changes/bug26785                    |     4 +
 changes/bug26787                    |     3 +
 changes/bug26830                    |     3 +
 changes/bug26853                    |     3 +
 changes/bug26924                    |     4 +
 changes/bug26927                    |     4 +
 changes/bug26932                    |     3 +
 changes/bug27081                    |     4 +
 changes/bug27088                    |     5 +
 changes/bug27090                    |     3 +
 changes/bug27093                    |     3 +
 changes/bug27185                    |     3 +
 changes/bug27226                    |     5 +
 changes/bug27295                    |     3 +
 changes/bug27344                    |     4 +
 changes/bug27345                    |     5 +
 changes/bug27418                    |     3 +
 changes/bug27453                    |     3 +
 changes/bug27461                    |     5 +
 changes/bug27463                    |     3 +
 changes/bug27465                    |     5 +
 changes/geoip-2018-07-03            |     4 +
 changes/geoip-2018-08-07            |     4 +
 changes/geoip-2018-09-06            |     4 +
 changes/task26771                   |     4 +
 changes/ticket24629                 |     3 +
 changes/ticket26560                 |     3 +
 changes/ticket26647                 |     4 +
 changes/ticket26952-cargo           |     3 +
 changes/ticket26952-ccache          |     3 +
 changes/ticket27087                 |     3 +
 changes/ticket27252                 |     6 +
 changes/ticket27252-032             |     5 +
 configure.ac                        |    16 +-
 contrib/win32build/tor-mingw.nsi.in |     2 +-
 doc/HACKING/GettingStartedRust.md   |     7 +-
 src/common/address.c                |     5 +-
 src/common/compress_zstd.c          |     4 +
 src/common/sandbox.c                |     2 +-
 src/common/tortls.c                 |    17 +-
 src/config/geoip                    | 59634 +++++++++++-----------------------
 src/config/geoip6                   |  9942 +++---
 src/or/auth_dirs.inc                |     4 +-
 src/or/config.c                     |     9 +-
 src/or/connection_edge.c            |     1 -
 src/or/connection_or.c              |    14 +-
 src/or/control.c                    |     5 +-
 src/or/dirserv.c                    |    51 +-
 src/or/dirserv.h                    |     3 +-
 src/or/dirvote.c                    |     9 +-
 src/or/hs_service.c                 |     1 +
 src/or/main.c                       |     8 +
 src/or/rendclient.c                 |     9 +
 src/or/router.c                     |    15 +-
 src/rust/tor_util/include.am        |     1 -
 src/test/include.am                 |     2 +-
 src/test/test.c                     |    10 +-
 src/test/test_bt.sh                 |     2 +
 src/test/test_dir.c                 |    53 +-
 src/test/test_entrynodes.c          |     6 +
 src/test/test_key_expiration.sh     |     8 +
 src/test/test_keygen.sh             |     8 +
 src/test/test_rust.sh               |    17 +-
 src/test/test_tortls.c              |   122 +-
 src/win32/orconfig.h                |     2 +-
 74 files changed, 26267 insertions(+), 44144 deletions(-)