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

[nickm at torproject.org]

commit b915b6cd2171dd9b810bd318739e191db1a810b5
Merge: 27e426992 7da06e43d
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Dec 11 09:44:57 2018 -0500

    Merge remote-tracking branch 'github/prop297'

 Makefile.am                          |   2 +-
 changes/prop297                      |   7 ++
 configure.ac                         |  10 ++-
 doc/HACKING/ReleasingTor.md          |   6 +-
 scripts/maint/updateVersions.pl.in   |  59 ----------------
 scripts/maint/update_versions.py     | 133 +++++++++++++++++++++++++++++++++++
 src/core/or/versions.c               |  19 +++++
 src/core/or/versions.h               |   2 +
 src/feature/nodelist/networkstatus.c |   5 +-
 9 files changed, 176 insertions(+), 67 deletions(-)