diff -Nru ethereum-unstable-1.9.13+build21619+bionic/debian/changelog ethereum-unstable-1.9.13+build21630+bionic/debian/changelog
--- ethereum-unstable-1.9.13+build21619+bionic/debian/changelog	2020-04-02 14:48:02.000000000 +0000
+++ ethereum-unstable-1.9.13+build21630+bionic/debian/changelog	2020-04-02 20:25:20.000000000 +0000
@@ -1,5 +1,5 @@
-ethereum-unstable (1.9.13+build21619+bionic) bionic; urgency=low
+ethereum-unstable (1.9.13+build21630+bionic) bionic; urgency=low
 
-  * git build of f98cabad7cea07a96f80c7b68efc10ff08d483f4
+  * git build of f7b29ec942d91aee420d89d976ed94257398764e
 
- -- Go Ethereum Linux Builder <geth-ci@ethereum.org>  Thu, 02 Apr 2020 14:42:19 +0000
+ -- Go Ethereum Linux Builder <geth-ci@ethereum.org>  Thu, 02 Apr 2020 20:14:18 +0000
diff -Nru ethereum-unstable-1.9.13+build21619+bionic/debian/rules ethereum-unstable-1.9.13+build21630+bionic/debian/rules
--- ethereum-unstable-1.9.13+build21619+bionic/debian/rules	2020-04-02 14:48:02.000000000 +0000
+++ ethereum-unstable-1.9.13+build21630+bionic/debian/rules	2020-04-02 20:25:20.000000000 +0000
@@ -24,7 +24,7 @@
 	mv .mod $(GOPATH)/pkg/mod
 
 	# A fresh Go was built, all dependency downloads faked, hope build works now
-	../.go/bin/go run build/ci.go install -git-commit=f98cabad7cea07a96f80c7b68efc10ff08d483f4 -git-branch=master -git-tag= -buildnum=21619 -pull-request=false
+	../.go/bin/go run build/ci.go install -git-commit=f7b29ec942d91aee420d89d976ed94257398764e -git-branch=master -git-tag= -buildnum=21630 -pull-request=false
 
 override_dh_auto_test:
 
diff -Nru ethereum-unstable-1.9.13+build21619+bionic/rpc/websocket_test.go ethereum-unstable-1.9.13+build21630+bionic/rpc/websocket_test.go
--- ethereum-unstable-1.9.13+build21619+bionic/rpc/websocket_test.go	2020-04-02 14:48:02.000000000 +0000
+++ ethereum-unstable-1.9.13+build21630+bionic/rpc/websocket_test.go	2020-04-02 20:25:20.000000000 +0000
@@ -142,6 +142,7 @@
 
 	// Wait for the subscription result.
 	timeout := time.NewTimer(5 * time.Second)
+	defer timeout.Stop()
 	for {
 		select {
 		case err := <-sub.Err():
@@ -227,9 +228,11 @@
 
 	// Write messages.
 	var (
-		sendResponse <-chan time.Time
-		wantPong     string
+		wantPong string
+		timer    = time.NewTimer(0)
 	)
+	defer timer.Stop()
+	<-timer.C
 	for {
 		select {
 		case _, open := <-sendPing:
@@ -246,11 +249,10 @@
 				t.Errorf("got pong with wrong data %q", data)
 			}
 			wantPong = ""
-			sendResponse = time.NewTimer(200 * time.Millisecond).C
-		case <-sendResponse:
+			timer.Reset(200 * time.Millisecond)
+		case <-timer.C:
 			t.Logf("server sending response")
 			conn.WriteMessage(websocket.TextMessage, []byte(subNotify))
-			sendResponse = nil
 		case <-shutdown:
 			conn.Close()
 			return