[tor-commits] [pluggable-transports/snowflake] 07/07: Merge remote-tracking branch 'gitlab/main'

[gitolite role]

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

meskio pushed a commit to branch main
in repository pluggable-transports/snowflake.

commit f723cf52e877ddf890f4b19d706c19470631ef92
Merge: 297ca91 c097d5f
Author: meskio <meskio at torproject.org>
AuthorDate: Thu Apr 20 16:37:52 2023 +0200

    Merge remote-tracking branch 'gitlab/main'

 common/turbotunnel/queuepacketconn.go      | 49 +++++++++++++---
 common/turbotunnel/queuepacketconn_test.go | 89 +++++++++++++++++++++++++-----
 server/lib/http.go                         |  5 +-
 server/lib/snowflake.go                    | 10 +++-
 server/stats.go                            |  2 +-
 5 files changed, 127 insertions(+), 28 deletions(-)

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