commit 4313f1cce8b714b112cce16de8b643a6bf61ae7c Merge: 3405a311d d41427b05 Author: Nick Mathewson nickm@torproject.org Date: Tue Jun 11 10:22:37 2019 -0400

Merge branch 'ticket28453_v2' into ticket28453_v2_merged

doc/HACKING/EndOfLifeTor.md | 50 +++++++++++++++++++++++++++++++++++++++++++++ doc/HACKING/ReleasingTor.md | 10 +++++---- 2 files changed, 56 insertions(+), 4 deletions(-)