Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2025-05-07 17:05:16 -04:00
Code Issues Projects Releases Packages Wiki Activity

merge main and fix conflicts

Browse source
This commit is contained in:
Miguel Jacq 2025-02-03 17:10:32 +11:00
commit 17b8007514
No known key found for this signature in database
GPG key ID: 59B3F0C24135C6A9
137 changed files with 9945 additions and 2189 deletions
Download patch file Download diff file Expand all files Collapse all files

2
desktop/scripts/build-pt-meek.ps1
View file

@ -2,7 +2,7 @@ $env:MEEK_TAG = 'v0.38.0'
New-Item -ItemType Directory -Force -Path .\build\meek
cd .\build\meek
git clone https://git.torproject.org/pluggable-transports/meek.git
git clone https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/meek.git
cd meek
git checkout $MEEK_TAG
go build .\meek-client

2
desktop/scripts/build-pt-meek.sh
View file

@ -5,7 +5,7 @@ OS=$(uname -s)
mkdir -p ./build/meek
cd ./build/meek
git clone https://git.torproject.org/pluggable-transports/meek.git || echo "already cloned"
git clone https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/meek.git || echo "already cloned"
cd meek
git checkout $MEEK_TAG

2
desktop/scripts/build-pt-snowflake.ps1
View file

@ -2,7 +2,7 @@ $env:SNOWFLAKE_TAG = 'v2.8.1'
New-Item -ItemType Directory -Force -Path .\build\snowflake
cd .\build\snowflake
git clone https://git.torproject.org/pluggable-transports/snowflake.git
git clone https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake.git
cd snowflake
git checkout $SNOWFLAKE_TAG
go build .\client

2
desktop/scripts/build-pt-snowflake.sh
View file

@ -5,7 +5,7 @@ OS=$(uname -s)
mkdir -p ./build/snowflake
cd ./build/snowflake
git clone https://git.torproject.org/pluggable-transports/snowflake.git || echo "already cloned"
git clone https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake.git || echo "already cloned"
cd snowflake
git checkout $SNOWFLAKE_TAG
if [ "$OS" == "Darwin" ]; then

2
desktop/scripts/build-windows.py
View file

@ -324,7 +324,7 @@ def main():
@main.command()
def cleanup_build():
"""Delete unused PySide6 stuff to save space"""
build_path = os.path.join(desktop_dir, "build", "exe.win-amd64-3.11")
build_path = os.path.join(desktop_dir, "build", "exe.win-amd64-3.12")
before_size = get_size(build_path)
for dirname in ["qml"]:

BIN
desktop/scripts/tor-browser-devs.gpg
View file

Binary file not shown.