[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/1657'

[nickm at torproject.org]

commit 5e70c27e8560ac1885ae9d9e1b79d3838b49cc09
Merge: 5fa7c1b13 73ac1add3
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jan 15 13:10:14 2020 -0500

    Merge remote-tracking branch 'tor-github/pr/1657'

 changes/ticket32137              |   4 +
 scripts/maint/add_c_file.py      |   7 +-
 src/app/config/include.am        |  21 ++
 src/app/main/include.am          |  18 ++
 src/core/crypto/include.am       |  18 ++
 src/core/include.am              | 453 +--------------------------------------
 src/core/mainloop/include.am     |  22 ++
 src/core/or/include.am           |  98 +++++++++
 src/core/proto/include.am        |  18 ++
 src/feature/api/include.am       |  11 +
 src/feature/client/include.am    |  20 ++
 src/feature/control/include.am   |  39 ++++
 src/feature/dirauth/include.am   |  51 +++++
 src/feature/dircache/include.am  |  15 ++
 src/feature/dirclient/include.am |  12 ++
 src/feature/dircommon/include.am |  16 ++
 src/feature/dirparse/include.am  |  25 +++
 src/feature/hibernate/include.am |   8 +
 src/feature/hs/include.am        |  35 +++
 src/feature/hs_common/include.am |  10 +
 src/feature/keymgt/include.am    |   8 +
 src/feature/nodelist/include.am  |  49 +++++
 src/feature/relay/include.am     |  39 ++++
 src/feature/rend/include.am      |  22 ++
 src/feature/stats/include.am     |  12 ++
 src/include.am                   |  37 ++++
 26 files changed, 611 insertions(+), 457 deletions(-)