Fix TestLegacyPassthrough

psiphon/server/meek.go

@@ -315,7 +315,7 @@ func (server *MeekServer) Run() error {
 	var err error
 	if server.tlsConfig != nil {
 		httpsServer := HTTPSServer{Server: httpServer}
-		err = httpsServer.ServeTLS(server.listener, server.tlsConfig)
+		err = httpsServer.ServeTLS(server.listener, server.tlsConfig, server.tlsExtraConfig)
 	} else {
 		err = httpServer.Serve(server.listener)
 	}

psiphon/server/net.go

@@ -73,7 +73,7 @@ type HTTPSServer struct {
 //
 // Note that the http.Server.TLSConfig field is ignored and the tls.Config
 // parameter is used intead.
-func (server *HTTPSServer) ServeTLS(listener net.Listener, config *tls.Config) error {
-	tlsListener := tls.NewListener(listener, config, nil)
+func (server *HTTPSServer) ServeTLS(listener net.Listener, config *tls.Config, extraConfig *tls.ExtraConfig) error {
+	tlsListener := tls.NewListener(listener, config, extraConfig)
 	return server.Serve(tlsListener)
 }