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

[nickm at torproject.org]

commit de4d7c3837c36fa4c78d10a49837ba505d723727
Merge: fe9f58514 aeffbe510
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jul 31 08:21:10 2018 -0400

    Merge branch 'ticket26447'

 Makefile.am                    |  4 ++--
 changes/ticket26447            |  5 +++++
 scripts/maint/checkIncludes.py | 26 ++++++++++++++++++++++++--
 3 files changed, 31 insertions(+), 4 deletions(-)