start-tor.exe: mode menu (direct/webtunnel/obfs4/vanilla) with bundled bridge lists; drop PS launchers

Author: Delta-Kronecker

.github/workflows/build.yml

@@ -80,6 +80,13 @@ jobs:
           ./configure --host=x86_64-w64-mingw32 \
             --disable-asciidoc --disable-man --disable-html-docs
 
+      - name: Upload configure log (on failure)
+        if: failure() && hashFiles('tor-src/config.log') != ''
+        uses: actions/upload-artifact@v4
+        with:
+          name: config-log
+          path: tor-src/config.log
+
       - name: Build
         shell: msys2 {0}
         run: |
@@ -97,7 +104,7 @@ jobs:
         shell: msys2 {0}
         run: |
           cd "$GITHUB_WORKSPACE/tor-src"
-          mkdir -p ../dist/data/scripts
+          mkdir -p ../dist/data/bridges
           cp src/app/tor.exe ../dist/data/
           cp "$MINGW_PREFIX"/bin/libevent*.dll "$MINGW_PREFIX"/bin/libssl-3-x64.dll "$MINGW_PREFIX"/bin/libcrypto-3-x64.dll "$MINGW_PREFIX"/bin/zlib1.dll ../dist/data/ 2>/dev/null || true
           cp src/config/geoip src/config/geoip6 ../dist/data/
@@ -114,12 +121,11 @@ jobs:
           Copy-Item "transports\*.exe" -Destination "dist\data\" -Force
           Get-ChildItem "dist" -Recurse -File | Select-Object FullName, Length
 
-      - name: Copy portable config, scripts, README
+      - name: Copy config template, bridges, README
         shell: pwsh
         run: |
-          Copy-Item "configs\torrc.iran" "dist\data\torrc" -Force
-          Copy-Item "scripts\launcher.ps1" "dist\data\scripts\" -Force
-          Copy-Item "scripts\fetch-bridges.ps1" "dist\data\scripts\" -Force
+          Copy-Item "configs\torrc.iran" "dist\data\torrc.template" -Force
+          Copy-Item "bridges\*.txt" "dist\data\bridges\" -Force
           Copy-Item "README.md" "dist\data\README.md" -Force
 
       - name: Compile start-tor.exe

README.md

@@ -8,39 +8,39 @@ state stays inside one folder, so you can copy or move it anywhere.
 ## Layout
 
 ```
-start-tor.exe          double-click to start Tor and set the system proxy
-data\                  everything else lives here
-  tor.exe              + DLLs, geoip, geoip6, transports (obfs4/snowflake/webtunnel)
-  torrc                portable config (relative paths; sits next to tor.exe)
-  scripts\             launcher.ps1 (new identity / stop) + fetch-bridges.ps1
+start-tor.exe          double-click to start; asks for a connection mode
+data\
+  tor.exe              + DLLs, geoip, geoip6, transports
+  torrc.template       base config (relative paths; sits next to tor.exe)
+  torrc                generated by start-tor.exe from the chosen mode
+  bridges\             obfs4_tested.txt, webtunnel_tested.txt, vanilla_tested.txt
   data\                runtime state (cached consensus, keys, tor.log)
 ```
 
 ## Usage
 
 1. Download the `tor-win64-portable` artifact from GitHub Actions and unzip.
-2. Double-click `start-tor.exe`.
-3. Tor bootstraps (direct by default). On 100% the system proxy is enabled
-   (HTTP 127.0.0.1:8118, SOCKS5 127.0.0.1:9050, DNS 127.0.0.1:53530).
-   Press Enter to stop Tor and restore the proxy.
+2. Double-click `start-tor.exe`, pick a mode:
+   - **1 Direct** — no bridges (works when Tor is not blocked)
+   - **2 WebTunnel**, **3 Obfs4**, **4 Vanilla** — bridges from `data\bridges\`
+   Your choice is remembered for next time (`data\mode.txt`).
+3. On 100% bootstrap the system proxy is enabled (HTTP 127.0.0.1:8118,
+   SOCKS5 127.0.0.1:9050, DNS 127.0.0.1:53530). Press Enter to stop and restore.
 
-## If Tor is blocked
-
-Run `data\scripts\fetch-bridges.ps1` to fetch fresh bridges (it rewrites
-`data\torrc`), then start again.
-
-## Advanced
+You can also launch with a fixed mode or command:
 
 ```
-data\scripts\launcher.ps1 -NewCircuit   request a new identity
-data\scripts\launcher.ps1 -Stop         stop Tor and restore the proxy
+start-tor.exe obfs4            start directly in obfs4 mode
+start-tor.exe --newcircuit     request a new identity (NEWNYM)
+start-tor.exe --stop           stop Tor and restore the proxy
 ```
 
-## Build
+## Building
 
-`.github/workflows/build.yml` builds tor + transports on every push and
-publishes the `tor-win64-portable` artifact.
+`.github/workflows/build.yml` builds tor + transports and publishes the
+`tor-win64-portable` artifact on every push.
 
 - `tor-src\` — unmodified official tor 0.4.9.11 source
-- `configs\torrc.iran` — the portable config template (becomes `data\torrc`)
-- `scripts\start-tor.cs` — source of `start-tor.exe` (compiled with `build-start-tor.ps1`)
+- `configs\torrc.iran` — portable config template (becomes `data\torrc.template`)
+- `bridges\` — tested bridge lists shipped with the release
+- `scripts\start-tor.cs` — source of `start-tor.exe` (compiled with `scripts\build-start-tor.ps1`)