chore: sync with v3.26.0

.github/workflows/build.yml

@@ -11,5 +11,5 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-go@v3
         with:
-          go-version: "1.23.4"
+          go-version: "1.23.7"
       - run: go build ./...

UPSTREAM

@@ -1 +1 @@
-v3.25.0
+v3.26.0

go.mod

@@ -2,11 +2,11 @@ module github.com/ooni/probe-engine
 
 go 1.23.0
 
-toolchain go1.23.4
+toolchain go1.23.7
 
 require (
 	filippo.io/age v1.2.1
-	github.com/Psiphon-Labs/psiphon-tunnel-core v1.0.11-0.20250319154633-ceb78316d06e
+	github.com/Psiphon-Labs/psiphon-tunnel-core v1.0.11-0.20250604135210-85a7bd92a4ba
 	github.com/apex/log v1.9.0
 	github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5
 	github.com/cloudflare/circl v1.5.0
@@ -24,7 +24,7 @@ require (
 	github.com/montanaflynn/stats v0.7.1
 	github.com/ooni/minivpn v0.0.7
 	github.com/ooni/netem v0.0.0-20240208095707-608dcbcd82b8
-	github.com/ooni/probe-assets v0.26.0
+	github.com/ooni/probe-assets v0.27.0
 	github.com/oschwald/maxminddb-golang v1.13.1
 	github.com/pborman/getopt/v2 v2.1.0
 	github.com/pion/stun v0.6.1
@@ -56,7 +56,7 @@ require (
 	github.com/Psiphon-Labs/consistent v0.0.0-20240322131436-20aaa4e05737 // indirect
 	github.com/Psiphon-Labs/goptlib v0.0.0-20200406165125-c0e32a7a3464 // indirect
 	github.com/Psiphon-Labs/psiphon-tls v0.0.0-20250318183125-2a2fae2db378 // indirect
-	github.com/Psiphon-Labs/quic-go v0.0.0-20250318213212-301924cbe026 // indirect
+	github.com/Psiphon-Labs/quic-go v0.0.0-20250527153145-79fe45fb83b1 // indirect
 	github.com/Psiphon-Labs/utls v1.1.1-0.20241107183331-b18909f8ccaa // indirect
 	github.com/alexbrainman/sspi v0.0.0-20231016080023-1a75b4708caa // indirect
 	github.com/andybalholm/brotli v1.1.1 // indirect
@@ -170,7 +170,7 @@ require (
 	github.com/vishvananda/netlink v1.2.1-beta.2 // indirect
 	github.com/vishvananda/netns v0.0.4 // indirect
 	github.com/wader/filtertransport v0.0.0-20200316221534-bdd9e61eee78 // indirect
-	github.com/wlynxg/anet v0.0.3 // indirect
+	github.com/wlynxg/anet v0.0.5 // indirect
 	github.com/x448/float16 v0.8.4 // indirect
 	github.com/xtaci/kcp-go/v5 v5.6.8 // indirect
 	github.com/xtaci/smux v1.5.31 // indirect

go.sum

@@ -35,10 +35,10 @@ github.com/Psiphon-Labs/goptlib v0.0.0-20200406165125-c0e32a7a3464 h1:VmnMMMheFX
 github.com/Psiphon-Labs/goptlib v0.0.0-20200406165125-c0e32a7a3464/go.mod h1:Pe5BqN2DdIdChorAXl6bDaQd/wghpCleJfid2NoSli0=
 github.com/Psiphon-Labs/psiphon-tls v0.0.0-20250318183125-2a2fae2db378 h1:LqI8cxnYxgUKLLvv+XZKpxZAQcov6xhEKgC82FdvG/k=
 github.com/Psiphon-Labs/psiphon-tls v0.0.0-20250318183125-2a2fae2db378/go.mod h1:7ZUnPnWT5z8J8hxfsVjKHYK77Zme/Y0If1b/zeziiJs=
-github.com/Psiphon-Labs/psiphon-tunnel-core v1.0.11-0.20250319154633-ceb78316d06e h1:J47d+9jsigy2T+763M1vdRuq5aqMUZ56IRXU8MdpW/M=
-github.com/Psiphon-Labs/psiphon-tunnel-core v1.0.11-0.20250319154633-ceb78316d06e/go.mod h1:HvJvOtzWZ9ESc5T9OK0Db49BX8vfdgOzxHVqirHfOLY=
-github.com/Psiphon-Labs/quic-go v0.0.0-20250318213212-301924cbe026 h1:HT5a/8JUfI1H2eA9g5LPyOZis1wa+gzFdXMgWYWB88I=
-github.com/Psiphon-Labs/quic-go v0.0.0-20250318213212-301924cbe026/go.mod h1:rONdWgPMbFjyyBai7gB1IBF4pT9r4l0GyiDst5XR1SY=
+github.com/Psiphon-Labs/psiphon-tunnel-core v1.0.11-0.20250604135210-85a7bd92a4ba h1:WPAeM6Dn0GmLNaRLlEdKRSeFZ7tV8kM3s5+lTQJ4JQ8=
+github.com/Psiphon-Labs/psiphon-tunnel-core v1.0.11-0.20250604135210-85a7bd92a4ba/go.mod h1:1BflUn6FnGX/FlC9GFp5fFFV7ePyVUtnj3lTxZDCXwA=
+github.com/Psiphon-Labs/quic-go v0.0.0-20250527153145-79fe45fb83b1 h1:zD7JvZCV8gjvtI0AZmE81Ffc/v7A+qwU1/YfUmN/Flk=
+github.com/Psiphon-Labs/quic-go v0.0.0-20250527153145-79fe45fb83b1/go.mod h1:rONdWgPMbFjyyBai7gB1IBF4pT9r4l0GyiDst5XR1SY=
 github.com/Psiphon-Labs/utls v1.1.1-0.20241107183331-b18909f8ccaa h1:5FszHIhxb7yO267qt47tTfJOtD31k7R80L88EwNm4tc=
 github.com/Psiphon-Labs/utls v1.1.1-0.20241107183331-b18909f8ccaa/go.mod h1:dxmztdV9lf59cq44YY8r21m3b+xSjhg98cgZW8WK1p0=
 github.com/alexbrainman/sspi v0.0.0-20231016080023-1a75b4708caa h1:LHTHcTQiSGT7VVbI0o4wBRNQIgn917usHWOd6VAffYI=
@@ -387,8 +387,8 @@ github.com/ooni/minivpn v0.0.7 h1:fRL6lOivKM+Q23HcN/FFiBftbKTAtz7U8r6cOypBAeM=
 github.com/ooni/minivpn v0.0.7/go.mod h1:0KNwmK2Wg9lDbk936XjtxvCq4tPNbK4C3IJvyLwIMrE=
 github.com/ooni/netem v0.0.0-20240208095707-608dcbcd82b8 h1:kJ2wn19lIP/y9ng85BbFRdWKHK6Er116Bbt5uhqHVD4=
 github.com/ooni/netem v0.0.0-20240208095707-608dcbcd82b8/go.mod h1:b/wAvTR5n92Vk2b0SBmuMU0xO4ZGVrsXtU7zjTby7vw=
-github.com/ooni/probe-assets v0.26.0 h1:pzhUcKOK7S0VNEeSeK2H6o5+KhuihNTQRtfXC7R7Spk=
-github.com/ooni/probe-assets v0.26.0/go.mod h1:m0k2FFzcLfFm7dhgyYkLCUR3R0CoRPr0jcjctDS2+gU=
+github.com/ooni/probe-assets v0.27.0 h1:aTQTlsUle7u7uKafYDKEBTR/W90oq7jjmjl+dOoqmDo=
+github.com/ooni/probe-assets v0.27.0/go.mod h1:m0k2FFzcLfFm7dhgyYkLCUR3R0CoRPr0jcjctDS2+gU=
 github.com/oschwald/geoip2-golang v1.9.0 h1:uvD3O6fXAXs+usU+UGExshpdP13GAqp4GBrzN7IgKZc=
 github.com/oschwald/geoip2-golang v1.9.0/go.mod h1:BHK6TvDyATVQhKNbQBdrj9eAvuwOMi2zSFXizL3K81Y=
 github.com/oschwald/maxminddb-golang v1.13.1 h1:G3wwjdN9JmIK2o/ermkHM+98oX5fS+k5MbwsmL4MRQE=
@@ -595,8 +595,9 @@ github.com/vishvananda/netns v0.0.4 h1:Oeaw1EM2JMxD51g9uhtC0D7erkIjgmj8+JZc26m1Y
 github.com/vishvananda/netns v0.0.4/go.mod h1:SpkAiCQRtJ6TvvxPnOSyH3BMl6unz3xZlaprSwhNNJM=
 github.com/wader/filtertransport v0.0.0-20200316221534-bdd9e61eee78 h1:9sreu9e9KOihf2Y0NbpyfWhd1XFDcL4GTkPYL4IvMrg=
 github.com/wader/filtertransport v0.0.0-20200316221534-bdd9e61eee78/go.mod h1:HazXTRLhXFyq80TQp7PUXi6BKE6mS+ydEdzEqNBKopQ=
-github.com/wlynxg/anet v0.0.3 h1:PvR53psxFXstc12jelG6f1Lv4MWqE0tI76/hHGjh9rg=
 github.com/wlynxg/anet v0.0.3/go.mod h1:eay5PRQr7fIVAMbTbchTnO9gG65Hg/uYGdc7mguHxoA=
+github.com/wlynxg/anet v0.0.5 h1:J3VJGi1gvo0JwZ/P1/Yc/8p63SoW98B5dHkYDmpgvvU=
+github.com/wlynxg/anet v0.0.5/go.mod h1:eay5PRQr7fIVAMbTbchTnO9gG65Hg/uYGdc7mguHxoA=
 github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=
 github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg=
 github.com/xtaci/kcp-go/v5 v5.6.8 h1:jlI/0jAyjoOjT/SaGB58s4bQMJiNS41A2RKzR6TMWeI=

pkg/cmd/buildtool/android_test.go

@@ -702,12 +702,12 @@ func TestAndroidBuildCdepsOpenSSL(t *testing.T) {
 		expect: []buildtooltest.ExecExpectations{{
 			Env: []string{},
 			Argv: []string{
-				"curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.4.0.tar.gz",
+				"curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.5.0.tar.gz",
 			},
 		}, {
 			Env: []string{},
 			Argv: []string{
-				"tar", "-xf", "openssl-3.4.0.tar.gz",
+				"tar", "-xf", "openssl-3.5.0.tar.gz",
 			},
 		}, {
 			Env: []string{},
@@ -757,12 +757,12 @@ func TestAndroidBuildCdepsOpenSSL(t *testing.T) {
 		}, {
 			Env: []string{},
 			Argv: []string{
-				"curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.4.0.tar.gz",
+				"curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.5.0.tar.gz",
 			},
 		}, {
 			Env: []string{},
 			Argv: []string{
-				"tar", "-xf", "openssl-3.4.0.tar.gz",
+				"tar", "-xf", "openssl-3.5.0.tar.gz",
 			},
 		}, {
 			Env: []string{},
@@ -812,12 +812,12 @@ func TestAndroidBuildCdepsOpenSSL(t *testing.T) {
 		}, {
 			Env: []string{},
 			Argv: []string{
-				"curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.4.0.tar.gz",
+				"curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.5.0.tar.gz",
 			},
 		}, {
 			Env: []string{},
 			Argv: []string{
-				"tar", "-xf", "openssl-3.4.0.tar.gz",
+				"tar", "-xf", "openssl-3.5.0.tar.gz",
 			},
 		}, {
 			Env: []string{},
@@ -867,12 +867,12 @@ func TestAndroidBuildCdepsOpenSSL(t *testing.T) {
 		}, {
 			Env: []string{},
 			Argv: []string{
-				"curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.4.0.tar.gz",
+				"curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.5.0.tar.gz",
 			},
 		}, {
 			Env: []string{},
 			Argv: []string{
-				"tar", "-xf", "openssl-3.4.0.tar.gz",
+				"tar", "-xf", "openssl-3.5.0.tar.gz",
 			},
 		}, {
 			Env: []string{},
@@ -1738,12 +1738,12 @@ func TestAndroidBuildCdepsTor(t *testing.T) {
 		expect: []buildtooltest.ExecExpectations{{
 			Env: []string{},
 			Argv: []string{
-				"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.14.tar.gz",
+				"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.16.tar.gz",
 			},
 		}, {
 			Env: []string{},
 			Argv: []string{
-				"tar", "-xf", "tor-0.4.8.14.tar.gz",
+				"tar", "-xf", "tor-0.4.8.16.tar.gz",
 			},
 		}, {
 			Env: []string{},
@@ -1827,12 +1827,12 @@ func TestAndroidBuildCdepsTor(t *testing.T) {
 		}, {
 			Env: []string{},
 			Argv: []string{
-				"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.14.tar.gz",
+				"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.16.tar.gz",
 			},
 		}, {
 			Env: []string{},
 			Argv: []string{
-				"tar", "-xf", "tor-0.4.8.14.tar.gz",
+				"tar", "-xf", "tor-0.4.8.16.tar.gz",
 			},
 		}, {
 			Env: []string{},
@@ -1916,12 +1916,12 @@ func TestAndroidBuildCdepsTor(t *testing.T) {
 		}, {
 			Env: []string{},
 			Argv: []string{
-				"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.14.tar.gz",
+				"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.16.tar.gz",
 			},
 		}, {
 			Env: []string{},
 			Argv: []string{
-				"tar", "-xf", "tor-0.4.8.14.tar.gz",
+				"tar", "-xf", "tor-0.4.8.16.tar.gz",
 			},
 		}, {
 			Env: []string{},
@@ -2005,12 +2005,12 @@ func TestAndroidBuildCdepsTor(t *testing.T) {
 		}, {
 			Env: []string{},
 			Argv: []string{
-				"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.14.tar.gz",
+				"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.16.tar.gz",
 			},
 		}, {
 			Env: []string{},
 			Argv: []string{
-				"tar", "-xf", "tor-0.4.8.14.tar.gz",
+				"tar", "-xf", "tor-0.4.8.16.tar.gz",
 			},
 		}, {
 			Env: []string{},

pkg/cmd/buildtool/cdepsopenssl.go

@@ -27,13 +27,13 @@ func cdepsOpenSSLBuildMain(globalEnv *cBuildEnv, deps buildtoolmodel.Dependencie
 	defer restore()
 
 	// See https://github.com/Homebrew/homebrew-core/blob/master/Formula/o/openssl@3.rb
-	cdepsMustFetch("https://www.openssl.org/source/openssl-3.4.0.tar.gz")
+	cdepsMustFetch("https://www.openssl.org/source/openssl-3.5.0.tar.gz")
 	deps.VerifySHA256( // must be mockable
-		"e15dda82fe2fe8139dc2ac21a36d4ca01d5313c75f99f46c4e8a27709b7294bf",
-		"openssl-3.4.0.tar.gz",
+		"344d0a79f1a9b08029b0744e2cc401a43f9c90acd1044d09a530b4885a8e9fc0",
+		"openssl-3.5.0.tar.gz",
 	)
-	must.Run(log.Log, "tar", "-xf", "openssl-3.4.0.tar.gz")
-	_ = deps.MustChdir("openssl-3.4.0") // must be mockable
+	must.Run(log.Log, "tar", "-xf", "openssl-3.5.0.tar.gz")
+	_ = deps.MustChdir("openssl-3.5.0") // must be mockable
 
 	mydir := filepath.Join(topdir, "CDEPS", "openssl")
 	for _, patch := range cdepsMustListPatches(mydir) {

pkg/cmd/buildtool/cdepstor.go

@@ -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.14.tar.gz")
+	cdepsMustFetch("https://www.torproject.org/dist/tor-0.4.8.16.tar.gz")
 	deps.VerifySHA256( // must be mockable
-		"5047e1ded12d9aac4eb858f7634a627714dd58ce99053d517691a4b304a66d10",
-		"tor-0.4.8.14.tar.gz",
+		"6540dd377a120fb8e7d27530aa3b7ff72a0fa5b4f670fe1d64c987c1cfd390cb",
+		"tor-0.4.8.16.tar.gz",
 	)
-	must.Run(log.Log, "tar", "-xf", "tor-0.4.8.14.tar.gz")
-	_ = deps.MustChdir("tor-0.4.8.14") // must be mockable
+	must.Run(log.Log, "tar", "-xf", "tor-0.4.8.16.tar.gz")
+	_ = deps.MustChdir("tor-0.4.8.16") // must be mockable
 
 	mydir := filepath.Join(topdir, "CDEPS", "tor")
 	for _, patch := range cdepsMustListPatches(mydir) {

pkg/cmd/buildtool/gomobile.go

@@ -64,3 +64,30 @@ func gomobileBuild(config *gomobileConfig) {
 
 	runtimex.Try0(shellx.RunEx(defaultShellxConfig(), argv, config.envp))
 }
+
+// oomobileBuild runs a build based on oomobile
+func oomobileBuild(config *gomobileConfig) {
+	// Undoes the effects of go-getting golang.org/x/mobile/cmd/gomobile
+	defer must.Run(log.Log, "go", "mod", "tidy")
+
+	must.Run(log.Log, "go", "install", "github.com/ooni/oomobile/cmd/gomobile@latest")
+	must.Run(log.Log, "go", "install", "github.com/ooni/oomobile/cmd/gobind@latest")
+
+	gopath := config.deps.GOPATH()
+	gomobile := filepath.Join(gopath, "bin", "gomobile")
+	must.Run(log.Log, gomobile, "init")
+
+	// Adding gomobile to go.mod as documented by golang.org/wiki/Mobile
+	must.Run(log.Log, "go", "get", "-d", "github.com/ooni/oomobile/cmd/gomobile")
+
+	argv := runtimex.Try1(shellx.NewArgv(gomobile, "bind"))
+	argv.Append("-target", config.target)
+	argv.Append("-o", config.output)
+	for _, entry := range config.extraFlags {
+		argv.Append(entry)
+	}
+
+	argv.Append("./pkg/oonimkall")
+
+	runtimex.Try0(shellx.RunEx(defaultShellxConfig(), argv, config.envp))
+}

pkg/cmd/buildtool/ios_test.go

@@ -349,12 +349,12 @@ func TestIOSBuildCdepsOpenSSL(t *testing.T) {
 		expect: []buildtooltest.ExecExpectations{{
 			Env: []string{},
 			Argv: []string{
-				"curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.4.0.tar.gz",
+				"curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.5.0.tar.gz",
 			},
 		}, {
 			Env: []string{},
 			Argv: []string{
-				"tar", "-xf", "openssl-3.4.0.tar.gz",
+				"tar", "-xf", "openssl-3.5.0.tar.gz",
 			},
 		}, {
 			Env: []string{},
@@ -399,12 +399,12 @@ func TestIOSBuildCdepsOpenSSL(t *testing.T) {
 		}, {
 			Env: []string{},
 			Argv: []string{
-				"curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.4.0.tar.gz",
+				"curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.5.0.tar.gz",
 			},
 		}, {
 			Env: []string{},
 			Argv: []string{
-				"tar", "-xf", "openssl-3.4.0.tar.gz",
+				"tar", "-xf", "openssl-3.5.0.tar.gz",
 			},
 		}, {
 			Env: []string{},
@@ -449,12 +449,12 @@ func TestIOSBuildCdepsOpenSSL(t *testing.T) {
 		}, {
 			Env: []string{},
 			Argv: []string{
-				"curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.4.0.tar.gz",
+				"curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.5.0.tar.gz",
 			},
 		}, {
 			Env: []string{},
 			Argv: []string{
-				"tar", "-xf", "openssl-3.4.0.tar.gz",
+				"tar", "-xf", "openssl-3.5.0.tar.gz",
 			},
 		}, {
 			Env: []string{},
@@ -1142,12 +1142,12 @@ func TestIOSBuildCdepsTor(t *testing.T) {
 		expect: []buildtooltest.ExecExpectations{{
 			Env: []string{},
 			Argv: []string{
-				"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.14.tar.gz",
+				"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.16.tar.gz",
 			},
 		}, {
 			Env: []string{},
 			Argv: []string{
-				"tar", "-xf", "tor-0.4.8.14.tar.gz",
+				"tar", "-xf", "tor-0.4.8.16.tar.gz",
 			},
 		}, {
 			Env: []string{},
@@ -1232,12 +1232,12 @@ func TestIOSBuildCdepsTor(t *testing.T) {
 		}, {
 			Env: []string{},
 			Argv: []string{
-				"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.14.tar.gz",
+				"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.16.tar.gz",
 			},
 		}, {
 			Env: []string{},
 			Argv: []string{
-				"tar", "-xf", "tor-0.4.8.14.tar.gz",
+				"tar", "-xf", "tor-0.4.8.16.tar.gz",
 			},
 		}, {
 			Env: []string{},
@@ -1322,12 +1322,12 @@ func TestIOSBuildCdepsTor(t *testing.T) {
 		}, {
 			Env: []string{},
 			Argv: []string{
-				"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.14.tar.gz",
+				"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.16.tar.gz",
 			},
 		}, {
 			Env: []string{},
 			Argv: []string{
-				"tar", "-xf", "tor-0.4.8.14.tar.gz",
+				"tar", "-xf", "tor-0.4.8.16.tar.gz",
 			},
 		}, {
 			Env: []string{},

pkg/cmd/buildtool/linuxcdeps_test.go

@@ -92,12 +92,12 @@ func TestLinuxCdepsBuildMain(t *testing.T) {
 		expect: []buildtooltest.ExecExpectations{{
 			Env: []string{},
 			Argv: []string{
-				"curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.4.0.tar.gz",
+				"curl", "-fsSLO", "https://www.openssl.org/source/openssl-3.5.0.tar.gz",
 			},
 		}, {
 			Env: []string{},
 			Argv: []string{
-				"tar", "-xf", "openssl-3.4.0.tar.gz",
+				"tar", "-xf", "openssl-3.5.0.tar.gz",
 			},
 		}, {
 			Env: []string{},
@@ -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.14.tar.gz",
+				"curl", "-fsSLO", "https://www.torproject.org/dist/tor-0.4.8.16.tar.gz",
 			},
 		}, {
 			Env: []string{},
 			Argv: []string{
-				"tar", "-xf", "tor-0.4.8.14.tar.gz",
+				"tar", "-xf", "tor-0.4.8.16.tar.gz",
 			},
 		}, {
 			Env: []string{},