commit 5d4005abfdbaf1e9a676ded589ebb9a3ae6f9b3e Merge: 5fea7d849 e93801bfe Author: Nick Mathewson nickm@torproject.org Date: Mon Dec 9 13:01:24 2019 -0500

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

changes/ticket32704 | 3 +++ scripts/maint/format_changelog.py | 41 ++++++++++++++++++++------------------- scripts/maint/sortChanges.py | 11 ++++++----- 3 files changed, 30 insertions(+), 25 deletions(-)