[tor-commits] [pluggable-transports/snowflake] 04/04: Merge remote-tracking branch 'gitlab/mr/102'

[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 56063efbbaf2c5d4deccf0302706abf1d466eb87
Merge: 5ef5142 068af08
Author: meskio <meskio at torproject.org>
AuthorDate: Tue Oct 11 18:47:47 2022 +0200

    Merge remote-tracking branch 'gitlab/mr/102'

 proxy/lib/snowflake.go | 23 +++++++++++++++++------
 proxy/main.go          | 29 ++++++++++++++++++++++++++++-
 2 files changed, 45 insertions(+), 7 deletions(-)


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