[tor-commits] [torspec] 05/05: Merge branch 'tor-gitlab/mr/132'

[gitolite role]

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

dgoulet pushed a commit to branch main
in repository torspec.

commit 51e2149dd35f33e3f46115067503db044b0f81f6
Merge: a1cd058 7ea74b9
Author: David Goulet <dgoulet at torproject.org>
AuthorDate: Wed May 24 14:48:07 2023 -0400

    Merge branch 'tor-gitlab/mr/132'

 proposals/329-traffic-splitting.txt | 227 ++++++++++++++++++++++--------------
 1 file changed, 137 insertions(+), 90 deletions(-)

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