commit 0efcdb8918681763799b871b53785d77edbbf088 Merge: a762234ba b1a571f03 Author: teor teor@torproject.org Date: Fri Apr 3 21:59:19 2020 +1000

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

Ignored conflicting style changes: they will be re-applied in the next commit.

doc/HACKING/EndOfLifeTor.md | 48 ---------------- doc/HACKING/ReleaseSeriesLifecycle.md | 101 ++++++++++++++++++++++++++++++++++ 2 files changed, 101 insertions(+), 48 deletions(-)