[tor-commits] [tor/master] Merge branch 'http_tunnel_squashed'

[nickm at torproject.org]

commit 73b0e2e6fd02140d349ebc6d4ae44c6a28a0f39c
Merge: c0b9f594b ad9190404
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Sep 5 14:34:29 2017 -0400

    Merge branch 'http_tunnel_squashed'

 changes/feature22407                  |   5 ++
 doc/tor.1.txt                         |  15 +++-
 scripts/codegen/fuzzing_include_am.py |   1 +
 src/or/config.c                       |  15 +++-
 src/or/connection.c                   |   8 ++-
 src/or/connection_edge.c              | 125 ++++++++++++++++++++++++++++++++--
 src/or/connection_edge.h              |   9 ++-
 src/or/directory.c                    |  38 ++++++++---
 src/or/directory.h                    |   3 +
 src/or/networkstatus.c                |   3 +-
 src/or/or.h                           |  18 ++++-
 src/or/reasons.c                      |  52 ++++++++++++++
 src/or/reasons.h                      |   1 +
 src/or/relay.c                        |   3 +-
 src/test/fuzz/fuzz_http_connect.c     | 105 ++++++++++++++++++++++++++++
 src/test/fuzz/include.am              |  23 +++++++
 16 files changed, 397 insertions(+), 27 deletions(-)