commit 1190636f24ec0f3f4a1d43ceb9e0cfc68c340d57 Merge: adc7b50ea 765e4364d Author: Nick Mathewson nickm@torproject.org Date: Mon Jun 10 09:37:28 2019 -0400

Merge branch 'maint-0.4.1'

changes/doc30630 | 3 +++ doc/HACKING/ReleasingTor.md | 9 +++++++-- 2 files changed, 10 insertions(+), 2 deletions(-)