commit 7c239cfb174080df475435343ad1202af75a41b3 Author: David Fifield david@bamsoftware.com Date: Thu Apr 20 00:50:04 2017 -0700
fmt --- meek-server/meek-server.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/meek-server/meek-server.go b/meek-server/meek-server.go index d0be266..2b49897 100644 --- a/meek-server/meek-server.go +++ b/meek-server/meek-server.go @@ -273,7 +273,7 @@ func (state *State) ExpireSessions() { } }
-func listenTLS(network string, addr *net.TCPAddr, getCertificate func (*tls.ClientHelloInfo) (*tls.Certificate, error)) (net.Listener, error) { +func listenTLS(network string, addr *net.TCPAddr, getCertificate func(*tls.ClientHelloInfo) (*tls.Certificate, error)) (net.Listener, error) { // This is cribbed from the source of net/http.Server.ListenAndServeTLS. // We have to separate the Listen and Serve parts because we need to // report the listening address before entering Serve (which is an @@ -307,7 +307,7 @@ func startListener(network string, addr *net.TCPAddr) (net.Listener, error) { return startServer(ln) }
-func startListenerTLS(network string, addr *net.TCPAddr, getCertificate func (*tls.ClientHelloInfo) (*tls.Certificate, error)) (net.Listener, error) { +func startListenerTLS(network string, addr *net.TCPAddr, getCertificate func(*tls.ClientHelloInfo) (*tls.Certificate, error)) (net.Listener, error) { ln, err := listenTLS(network, addr, getCertificate) if err != nil { return nil, err @@ -386,7 +386,7 @@ func main() { // The outputs of this block of code are the disableTLS, // missing443Listener, and getCertificate variables. var missing443Listener = false - var getCertificate func (*tls.ClientHelloInfo) (*tls.Certificate, error) + var getCertificate func(*tls.ClientHelloInfo) (*tls.Certificate, error) if disableTLS { if acmeEmail != "" || acmeHostnamesCommas != "" || certFilename != "" || keyFilename != "" { log.Fatalf("The --acme-email, --acme-hostnames, --cert, and --key options are not allowed with --disable-tls.")
tor-commits@lists.torproject.org