[tor-commits] [pluggable-transports/snowflake-webext] 08/08: Merge branch 'mr/31'

[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-webext.

commit 9ef0843951acd5ba0ce07116fa1bdf3dc3977342
Merge: 169c3ea 3ae64d6
Author: meskio <meskio at torproject.org>
AuthorDate: Wed Jul 6 11:01:05 2022 +0200

    Merge branch 'mr/31'

 broker.js         |  58 +++++++++++++------------
 config.js         |   2 +-
 init-badge.js     |  10 ++---
 init-node.js      |   2 +-
 init-testing.js   |  21 ++++-----
 init-webext.js    |  16 +++----
 proxypair.js      |  79 ++++++++++++++++------------------
 shims.js          |   2 +-
 snowflake.js      | 103 ++++++++++++++++++++++-----------------------
 spec/util.spec.js |  14 +++---
 ui.js             |   2 +-
 util.js           | 124 ++++++++++++++++++++++++++++--------------------------
 websocket.js      |  12 +++---
 13 files changed, 224 insertions(+), 221 deletions(-)

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