Skip to content

chore: revert tor version for ooni libtor #1753

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DecFox merged 1 commit into from
Nov 19, 2025
Merged

chore: revert tor version for ooni libtor #1753

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions internal/cmd/buildtool/android_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1752,12 +1752,12 @@ func TestAndroidBuildCdepsTor(t *testing.T) {
expect: []buildtooltest.ExecExpectations{{
Env: []string{},
Argv: []string{
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.20.tar.gz",
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.17.tar.gz",
},
}, {
Env: []string{},
Argv: []string{
"tar", "-xf", "tor-0.4.8.20.tar.gz",
"tar", "-xf", "tor-0.4.8.17.tar.gz",
},
}, {
Env: []string{},
Expand Down Expand Up @@ -1841,12 +1841,12 @@ func TestAndroidBuildCdepsTor(t *testing.T) {
}, {
Env: []string{},
Argv: []string{
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.20.tar.gz",
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.17.tar.gz",
},
}, {
Env: []string{},
Argv: []string{
"tar", "-xf", "tor-0.4.8.20.tar.gz",
"tar", "-xf", "tor-0.4.8.17.tar.gz",
},
}, {
Env: []string{},
Expand Down Expand Up @@ -1930,12 +1930,12 @@ func TestAndroidBuildCdepsTor(t *testing.T) {
}, {
Env: []string{},
Argv: []string{
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.20.tar.gz",
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.17.tar.gz",
},
}, {
Env: []string{},
Argv: []string{
"tar", "-xf", "tor-0.4.8.20.tar.gz",
"tar", "-xf", "tor-0.4.8.17.tar.gz",
},
}, {
Env: []string{},
Expand Down Expand Up @@ -2019,12 +2019,12 @@ func TestAndroidBuildCdepsTor(t *testing.T) {
}, {
Env: []string{},
Argv: []string{
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.20.tar.gz",
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.17.tar.gz",
},
}, {
Env: []string{},
Argv: []string{
"tar", "-xf", "tor-0.4.8.20.tar.gz",
"tar", "-xf", "tor-0.4.8.17.tar.gz",
},
}, {
Env: []string{},
Expand Down
10 changes: 5 additions & 5 deletions internal/cmd/buildtool/cdepstor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@ func cdepsTorBuildMain(globalEnv *cBuildEnv, deps buildtoolmodel.Dependencies) {
defer restore()

// See https://github.com/Homebrew/homebrew-core/blob/master/Formula/t/tor.rb
cdepsMustFetch("https://www.torproject.org/dist/tor-0.4.8.20.tar.gz")
cdepsMustFetch("https://www.torproject.org/dist/tor-0.4.8.17.tar.gz")
deps.VerifySHA256( // must be mockable
"1bb22328cdd1ee948647bfced571efa78c12fc5064187b41d5254085b5282fa7",
"tor-0.4.8.20.tar.gz",
"b6a5f44b7eb69e3fa35dbf15524405b44837a481d43d81daddde3ff21fcbb8e9",
"tor-0.4.8.17.tar.gz",
)
must.Run(log.Log, "tar", "-xf", "tor-0.4.8.20.tar.gz")
_ = deps.MustChdir("tor-0.4.8.20") // must be mockable
must.Run(log.Log, "tar", "-xf", "tor-0.4.8.17.tar.gz")
_ = deps.MustChdir("tor-0.4.8.17") // must be mockable

mydir := filepath.Join(topdir, "CDEPS", "tor")
for _, patch := range cdepsMustListPatches(mydir) {
Expand Down
12 changes: 6 additions & 6 deletions internal/cmd/buildtool/ios_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1154,12 +1154,12 @@ func TestIOSBuildCdepsTor(t *testing.T) {
expect: []buildtooltest.ExecExpectations{{
Env: []string{},
Argv: []string{
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.20.tar.gz",
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.17.tar.gz",
},
}, {
Env: []string{},
Argv: []string{
"tar", "-xf", "tor-0.4.8.20.tar.gz",
"tar", "-xf", "tor-0.4.8.17.tar.gz",
},
}, {
Env: []string{},
Expand Down Expand Up @@ -1244,12 +1244,12 @@ func TestIOSBuildCdepsTor(t *testing.T) {
}, {
Env: []string{},
Argv: []string{
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.20.tar.gz",
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.17.tar.gz",
},
}, {
Env: []string{},
Argv: []string{
"tar", "-xf", "tor-0.4.8.20.tar.gz",
"tar", "-xf", "tor-0.4.8.17.tar.gz",
},
}, {
Env: []string{},
Expand Down Expand Up @@ -1334,12 +1334,12 @@ func TestIOSBuildCdepsTor(t *testing.T) {
}, {
Env: []string{},
Argv: []string{
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.20.tar.gz",
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.17.tar.gz",
},
}, {
Env: []string{},
Argv: []string{
"tar", "-xf", "tor-0.4.8.20.tar.gz",
"tar", "-xf", "tor-0.4.8.17.tar.gz",
},
}, {
Env: []string{},
Expand Down
4 changes: 2 additions & 2 deletions internal/cmd/buildtool/linuxcdeps_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,12 +322,12 @@ func TestLinuxCdepsBuildMain(t *testing.T) {
expect: []buildtooltest.ExecExpectations{{
Env: []string{},
Argv: []string{
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.20.tar.gz",
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.17.tar.gz",
},
}, {
Env: []string{},
Argv: []string{
"tar", "-xf", "tor-0.4.8.20.tar.gz",
"tar", "-xf", "tor-0.4.8.17.tar.gz",
},
}, {
Env: []string{},
Expand Down
Loading