commit 68df19049b01fca0fc88bf86cd3e3bd7627431a8 Merge: b2f3b3b7e 3c04c8317 Author: Nick Mathewson <nickm@torproject.org> Date: Thu Sep 21 16:25:30 2017 -0400 Merge branch 'ticket23564_squashed' Makefile.am | 4 +-- scripts/maint/lintChanges.py | 62 ++++++++++++++++++++++++++++++++------------ ticket23564 | 4 +++ 3 files changed, 52 insertions(+), 18 deletions(-)