Merge remote-tracking branch 'github/prop297'

diff --cc Makefile.am
Simple merge

diff --cc doc/HACKING/ReleasingTor.md
Simple merge

diff --cc src/core/or/versions.c
Simple merge

diff --cc src/feature/nodelist/networkstatus.c
Simple merge