commit 7b3efc386f472b12b1dba8329ee49eaf3c0782af Merge: f7e8b3b68 4313f1cce Author: George Kadianakis desnacked@riseup.net Date: Wed Jun 12 13:00:20 2019 +0300

Merge branch 'tor-github/pr/1102'

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