Skip to content

Commit 97aa0c0

Browse files
DecFoxDecFox
committed
Merge branch 'master' into release/3.28
2 parents 77de066 + 1c47265 commit 97aa0c0

4 files changed

Lines changed: 21 additions & 21 deletions

File tree

‎internal/cmd/buildtool/android_test.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1752,12 +1752,12 @@ func TestAndroidBuildCdepsTor(t *testing.T) {
17521752
expect: []buildtooltest.ExecExpectations{{
17531753
Env: []string{},
17541754
Argv: []string{
1755-
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.20.tar.gz",
1755+
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.17.tar.gz",
17561756
},
17571757
}, {
17581758
Env: []string{},
17591759
Argv: []string{
1760-
"tar", "-xf", "tor-0.4.8.20.tar.gz",
1760+
"tar", "-xf", "tor-0.4.8.17.tar.gz",
17611761
},
17621762
}, {
17631763
Env: []string{},
@@ -1841,12 +1841,12 @@ func TestAndroidBuildCdepsTor(t *testing.T) {
18411841
}, {
18421842
Env: []string{},
18431843
Argv: []string{
1844-
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.20.tar.gz",
1844+
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.17.tar.gz",
18451845
},
18461846
}, {
18471847
Env: []string{},
18481848
Argv: []string{
1849-
"tar", "-xf", "tor-0.4.8.20.tar.gz",
1849+
"tar", "-xf", "tor-0.4.8.17.tar.gz",
18501850
},
18511851
}, {
18521852
Env: []string{},
@@ -1930,12 +1930,12 @@ func TestAndroidBuildCdepsTor(t *testing.T) {
19301930
}, {
19311931
Env: []string{},
19321932
Argv: []string{
1933-
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.20.tar.gz",
1933+
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.17.tar.gz",
19341934
},
19351935
}, {
19361936
Env: []string{},
19371937
Argv: []string{
1938-
"tar", "-xf", "tor-0.4.8.20.tar.gz",
1938+
"tar", "-xf", "tor-0.4.8.17.tar.gz",
19391939
},
19401940
}, {
19411941
Env: []string{},
@@ -2019,12 +2019,12 @@ func TestAndroidBuildCdepsTor(t *testing.T) {
20192019
}, {
20202020
Env: []string{},
20212021
Argv: []string{
2022-
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.20.tar.gz",
2022+
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.17.tar.gz",
20232023
},
20242024
}, {
20252025
Env: []string{},
20262026
Argv: []string{
2027-
"tar", "-xf", "tor-0.4.8.20.tar.gz",
2027+
"tar", "-xf", "tor-0.4.8.17.tar.gz",
20282028
},
20292029
}, {
20302030
Env: []string{},

‎internal/cmd/buildtool/cdepstor.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@ func cdepsTorBuildMain(globalEnv *cBuildEnv, deps buildtoolmodel.Dependencies) {
2727
defer restore()
2828

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

3838
mydir := filepath.Join(topdir, "CDEPS", "tor")
3939
for _, patch := range cdepsMustListPatches(mydir) {

‎internal/cmd/buildtool/ios_test.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1154,12 +1154,12 @@ func TestIOSBuildCdepsTor(t *testing.T) {
11541154
expect: []buildtooltest.ExecExpectations{{
11551155
Env: []string{},
11561156
Argv: []string{
1157-
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.20.tar.gz",
1157+
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.17.tar.gz",
11581158
},
11591159
}, {
11601160
Env: []string{},
11611161
Argv: []string{
1162-
"tar", "-xf", "tor-0.4.8.20.tar.gz",
1162+
"tar", "-xf", "tor-0.4.8.17.tar.gz",
11631163
},
11641164
}, {
11651165
Env: []string{},
@@ -1244,12 +1244,12 @@ func TestIOSBuildCdepsTor(t *testing.T) {
12441244
}, {
12451245
Env: []string{},
12461246
Argv: []string{
1247-
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.20.tar.gz",
1247+
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.17.tar.gz",
12481248
},
12491249
}, {
12501250
Env: []string{},
12511251
Argv: []string{
1252-
"tar", "-xf", "tor-0.4.8.20.tar.gz",
1252+
"tar", "-xf", "tor-0.4.8.17.tar.gz",
12531253
},
12541254
}, {
12551255
Env: []string{},
@@ -1334,12 +1334,12 @@ func TestIOSBuildCdepsTor(t *testing.T) {
13341334
}, {
13351335
Env: []string{},
13361336
Argv: []string{
1337-
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.20.tar.gz",
1337+
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.17.tar.gz",
13381338
},
13391339
}, {
13401340
Env: []string{},
13411341
Argv: []string{
1342-
"tar", "-xf", "tor-0.4.8.20.tar.gz",
1342+
"tar", "-xf", "tor-0.4.8.17.tar.gz",
13431343
},
13441344
}, {
13451345
Env: []string{},

‎internal/cmd/buildtool/linuxcdeps_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -322,12 +322,12 @@ func TestLinuxCdepsBuildMain(t *testing.T) {
322322
expect: []buildtooltest.ExecExpectations{{
323323
Env: []string{},
324324
Argv: []string{
325-
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.20.tar.gz",
325+
"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.17.tar.gz",
326326
},
327327
}, {
328328
Env: []string{},
329329
Argv: []string{
330-
"tar", "-xf", "tor-0.4.8.20.tar.gz",
330+
"tar", "-xf", "tor-0.4.8.17.tar.gz",
331331
},
332332
}, {
333333
Env: []string{},

0 commit comments

Comments
 (0)