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

[nickm at torproject.org]

commit ef25f957e7912491ced116733e699ee341f2dadc
Merge: 963584334 221f5238a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Nov 1 13:22:16 2017 -0400

    Merge branch 'tor_api_squashed'

 .gitignore                     |   1 +
 changes/ticket23845            |   9 ++++
 configure.ac                   |   1 +
 src/or/config.c                |   3 +-
 src/or/git_revision.c          |  17 +++++++
 src/or/git_revision.h          |  12 +++++
 src/or/include.am              |  11 ++++-
 src/or/main.c                  |  12 +++--
 src/or/main.h                  |   2 -
 src/or/tor_api.c               |  88 +++++++++++++++++++++++++++++++++++
 src/or/tor_api.h               | 102 +++++++++++++++++++++++++++++++++++++++++
 src/or/tor_api_internal.h      |  20 ++++++++
 src/or/tor_main.c              |  12 -----
 src/test/bench.c               |   5 --
 src/test/fuzz/fuzzing_common.c |   3 --
 src/test/testing_common.c      |   6 ---
 src/tools/include.am           |   5 ++
 src/tools/tor_runner.c         | 101 ++++++++++++++++++++++++++++++++++++++++
 18 files changed, 374 insertions(+), 36 deletions(-)