[tor-commits] [goptlib/master] ClientSetup and ServerSetup don't exit anymore.

[dcf at torproject.org]

commit e74981b9acf761bd7891e36ca505bbd4a5b79b30
Author: David Fifield <david at bamsoftware.com>
Date:   Sat Nov 9 17:22:28 2013 -0800

    ClientSetup and ServerSetup don't exit anymore.
---
 pt.go |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pt.go b/pt.go
index d967c31..4e8170a 100644
--- a/pt.go
+++ b/pt.go
@@ -219,8 +219,8 @@ type ClientInfo struct {
 }
 
 // Check the client pluggable transports environments, emitting an error message
-// and exiting the program if any error is encountered. Returns a subset of
-// methodNames requested by Tor.
+// and returning a non-nil error if any error is encountered. Returns a subset
+// of methodNames requested by Tor.
 func ClientSetup(methodNames []string) (ClientInfo, error) {
 	var info ClientInfo
 
@@ -368,9 +368,9 @@ type ServerInfo struct {
 }
 
 // Check the server pluggable transports environments, emitting an error message
-// and exiting the program if any error is encountered. Resolves the various
-// requested bind addresses, the server ORPort and extended ORPort, and reads
-// the auth cookie file. Returns a ServerInfo struct.
+// and returning a non-nil error if any error is encountered. Resolves the
+// various requested bind addresses, the server ORPort and extended ORPort, and
+// reads the auth cookie file. Returns a ServerInfo struct.
 func ServerSetup(methodNames []string) (ServerInfo, error) {
 	var info ServerInfo