Merge branch 'master' into checkin_api

.github/workflows/android.yml

@@ -12,7 +12,7 @@ jobs:
         with:
           go-version: "1.14"
       - uses: actions/checkout@v2
-      - run: brew cask install android-sdk
+      - run: brew install --cask android-sdk
       - run: echo y | sdkmanager --install "platforms;android-29"
       - run: echo y | sdkmanager --install "ndk;21.3.6528147"
       - run: ./build-android.bash

build-android.bash

@@ -7,7 +7,7 @@ if [ -z "$ANDROID_HOME" -o "$1" = "--help" ]; then
     echo "Please set ANDROID_HOME. We assume you have installed"
     echo "the Android SDK. You can do that on macOS using:"
     echo ""
-    echo "    brew cask install android-sdk"
+    echo "    brew install --cask android-sdk"
     echo ""
     echo "Then make sure you install the required packages:"
     echo ""

internal/psiphonx/private/.gitignore

@@ -0,0 +1 @@
+*

netx/archival/archival.go

@@ -555,7 +555,7 @@ type TLSHandshake struct {
 func NewTLSHandshakesList(begin time.Time, events []trace.Event) []TLSHandshake {
 	var out []TLSHandshake
 	for _, ev := range events {
-		if ev.Name != "tls_handshake_done" {
+		if !strings.Contains(ev.Name, "_handshake_done") {
 			continue
 		}
 		out = append(out, TLSHandshake{

netx/quicdialer/saver.go

@@ -58,5 +58,5 @@ func (h HandshakeSaver) DialContext(ctx context.Context, network string,
 		TLSVersion:         tlsx.VersionString(state.Version),
 		Time:               stop,
 	})
-	return sess, err
+	return sess, nil
 }

resources/private/.gitignore

@@ -0,0 +1 @@
+*

testusing.bash

@@ -20,4 +20,4 @@ func main() {
 EOF
 go get -v github.com/ooni/probe-engine@$GITHUB_SHA
 go build -v .
-./x -OTunnel=psiphon -ni https://www.example.com urlgetter
+./x --yes -OTunnel=psiphon -ni https://www.example.com urlgetter

version/version.go

@@ -2,4 +2,4 @@
 package version
 
 // Version is the version of the engine
-const Version = "0.23.0-alpha.1"
+const Version = "0.23.0-alpha.2"