[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/1064' into maint-0.4.1

[nickm at torproject.org]

commit 765e4364d97cea17affef7413cda5fa02eb8f347
Merge: ecc5feff3 5d4b4f948
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jun 10 09:37:17 2019 -0400

    Merge remote-tracking branch 'tor-github/pr/1064' into maint-0.4.1

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