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

[nickm@xxxxxxxxxxxxxx]

commit fcb565612801ebcbbc27d47b19644039dfdebed2
Merge: 2693bf47e 9ad569c71
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Wed Dec 4 12:15:28 2019 -0500

    Merge branch 'ticket32609_squashed'

 Makefile.am                                             |  5 ++++-
 changes/ticket32609                                     |  3 +++
 scripts/git/pre-commit.git-hook                         | 17 ++++++++++++-----
 scripts/maint/practracker/includes.py                   |  4 ++++
 scripts/maint/practracker/testdata/.may_include         |  1 +
 scripts/maint/practracker/testdata/a.c                  |  3 +++
 scripts/maint/practracker/testdata/ex0-expected.txt     |  6 +++---
 .../practracker/testdata/ex1-overbroad-expected.txt     |  2 +-
 scripts/maint/practracker/testdata/ex1.txt              |  6 +++---
 src/app/config/.may_include                             |  2 ++
 src/app/main/.may_include                               |  1 +
 src/feature/api/.may_include                            |  1 +
 src/feature/client/.may_include                         |  1 +
 src/feature/control/.may_include                        |  1 +
 src/feature/dirauth/.may_include                        |  1 +
 src/feature/dircache/.may_include                       |  1 +
 src/feature/dirclient/.may_include                      |  1 +
 src/feature/dircommon/.may_include                      |  1 +
 src/feature/dirparse/.may_include                       |  1 +
 src/feature/hibernate/.may_include                      |  1 +
 src/feature/hs/.may_include                             |  1 +
 src/feature/hs_common/.may_include                      |  1 +
 src/feature/keymgt/.may_include                         |  1 +
 src/feature/nodelist/.may_include                       |  1 +
 src/feature/relay/.may_include                          |  1 +
 src/feature/rend/.may_include                           |  1 +
 src/feature/stats/.may_include                          |  1 +
 src/test/.may_include                                   |  2 ++
 src/test/fuzz/.may_include                              |  1 +
 src/tools/.may_include                                  |  1 +
 src/trunnel/.may_include                                |  1 +
 src/trunnel/hs/.may_include                             |  1 +
 32 files changed, 59 insertions(+), 13 deletions(-)

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits