[tor-commits] [tor] 01/01: Merge branch 'maint-0.4.7' into release-0.4.7

[gitolite role]

This is an automated email from the git hooks/post-receive script.

dgoulet pushed a commit to branch release-0.4.7
in repository tor.

commit 16990f8904b167ed32e341fa41566e8ffe2a22ef
Merge: eeb1f8b0fd 94f4d0968b
Author: David Goulet <dgoulet at torproject.org>
AuthorDate: Mon Jun 19 08:09:45 2023 -0400

    Merge branch 'maint-0.4.7' into release-0.4.7

 .gitlab-ci.yml                          |  4 ++--
 Makefile.am                             |  6 +++---
 doc/HACKING/CircuitPaddingQuickStart.md |  2 +-
 doc/HACKING/GettingStarted.md           |  2 +-
 doc/HACKING/README.1st.md               |  6 +++---
 doc/HACKING/WritingTests.md             |  2 +-
 scripts/git/git-push-all.sh             |  2 +-
 scripts/git/git-setup-dirs.sh           | 21 ++-------------------
 src/test/test-network.sh                |  3 ++-
 9 files changed, 16 insertions(+), 32 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.