jtorctl.patch

-    protected final void checkThread() {
-        if (thread == null)
-            launchThread(true);
+	private synchronized void checkThread() {
+		if(thread == null) launchThread(true);
     }
 
     /** helper: implement the main background loop. */
-    protected void react() throws IOException {
-        while (true) {
+	private void react() throws IOException {
+		while(true) {
             ArrayList<ReplyLine> lst = readReply();
-            if (lst.isEmpty()) {
+			if(lst.isEmpty()) {
                 // connection has been closed remotely! end the loop!
                 return;
             }
-            if ((lst.get(0)).status.startsWith("6"))
+			if((lst.get(0)).status.startsWith("6")) {
                 handleEvent(lst);
-            else {
+			} else {
                 Waiter w;
-                synchronized (waiters) {
+				synchronized(waiters) {
                     w = waiters.removeFirst();
                 }
                 w.setResponse(lst);
@@ -327,17 +299,14 @@
     /** Change the value of the configuration option 'key' to 'val'.
      */
     public void setConf(String key, String value) throws IOException {
-        List<String> lst = new ArrayList<String>();
-        lst.add(key+" "+value);
-        setConf(lst);
+		setConf(Arrays.asList(key + " " + value));
     }
 
     /** Change the values of the configuration options stored in kvMap. */
     public void setConf(Map<String, String> kvMap) throws IOException {
         List<String> lst = new ArrayList<String>();
-        for (Iterator<Map.Entry<String,String>> it = kvMap.entrySet().iterator(); it.hasNext(); ) {
-            Map.Entry<String,String> ent = it.next();
-            lst.add(ent.getKey()+" "+ent.getValue()+"\n");
+		for(Map.Entry<String, String> e : kvMap.entrySet()) {
+			lst.add(e.getKey() + " " + e.getValue() + "\n");
         }
         setConf(lst);
     }
@@ -345,34 +314,35 @@
     /** Changes the values of the configuration options stored in
      * <b>kvList</b>.  Each list element in <b>kvList</b> is expected to be
      * String of the format "key value".
-     *
+	 * <p>
      * Tor behaves as though it had just read each of the key-value pairs
      * from its configuration file.  Keywords with no corresponding values have
      * their configuration values reset to their defaults.  setConf is
-     * all-or-nothing: if there is an error in any of the configuration settings,
-     * Tor sets none of them.
-     *
+	 * all-or-nothing: if there is an error in any of the configuration
+	 * settings, Tor sets none of them.
+	 * <p>
      * When a configuration option takes multiple values, or when multiple
-     * configuration keys form a context-sensitive group (see getConf below), then
-     * setting any of the options in a setConf command is taken to reset all of
-     * the others.  For example, if two ORBindAddress values are configured, and a
-     * command arrives containing a single ORBindAddress value, the new
-     * command's value replaces the two old values.
-     * 
+	 * configuration keys form a context-sensitive group (see getConf below),
+	 * then setting any of the options in a setConf command is taken to reset
+	 * all of the others.  For example, if two ORBindAddress values are
+	 * configured, and a command arrives containing a single ORBindAddress
+	 * value, the new command's value replaces the two old values.
+	 * <p>
      * To remove all settings for a given option entirely (and go back to its
-     * default value), include a String in <b>kvList</b> containing the key and no value.
+	 * default value), include a String in <b>kvList</b> containing the key and
+	 * no value.
      */
     public void setConf(Collection<String> kvList) throws IOException {
-        if (kvList.size() == 0)
-            return;
+		if(kvList.size() == 0) return;
         StringBuffer b = new StringBuffer("SETCONF");
-        for (Iterator<String> it = kvList.iterator(); it.hasNext(); ) {
-            String kv = it.next();
-            int i = kv.indexOf(' ');
-            if (i == -1)
+		for(String kv : kvList) {
+			int idx = kv.indexOf(' ');
+			if(idx == -1) {
                 b.append(" ").append(kv);
-            b.append(" ").append(kv.substring(0,i)).append("=")
-                .append(quote(kv.substring(i+1)));
+			} else {
+				b.append(" ").append(kv.substring(0, idx));
+				b.append("=").append(quote(kv.substring(idx + 1)));
+			}
         }
         b.append("\r\n");
         sendAndWaitForResponse(b.toString(), null);
@@ -382,11 +352,9 @@
      * default values.
      **/
     public void resetConf(Collection<String> keys) throws IOException {
-        if (keys.size() == 0)
-            return;
+		if(keys.size() == 0) return;
         StringBuffer b = new StringBuffer("RESETCONF");
-        for (Iterator<String> it = keys.iterator(); it.hasNext(); ) {
-            String key = it.next();
+		for(String key : keys) {
             b.append(" ").append(key);
         }
         b.append("\r\n");
@@ -400,36 +368,38 @@
         return getConf(lst);
     }
 
-    /** Requests the values of the configuration variables listed in <b>keys</b>.
-     * Results are returned as a list of ConfigEntry objects.
-     * 
+	/** Requests the values of the configuration variables listed in
+	 * <b>keys</b>.  Results are returned as a list of ConfigEntry objects.
+	 * <p>
      * If an option appears multiple times in the configuration, all of its
      * key-value pairs are returned in order.
-     *
+	 * <p>
      * Some options are context-sensitive, and depend on other options with
      * different keywords.  These cannot be fetched directly.  Currently there
      * is only one such option: clients should use the "HiddenServiceOptions"
      * virtual keyword to get all HiddenServiceDir, HiddenServicePort,
      * HiddenServiceNodes, and HiddenServiceExcludeNodes option settings.
      */
-    public List<ConfigEntry> getConf(Collection<String> keys) throws IOException {
+	public List<ConfigEntry> getConf(Collection<String> keys)
+			throws IOException {
         StringBuffer sb = new StringBuffer("GETCONF");
-        for (Iterator<String> it = keys.iterator(); it.hasNext(); ) {
-            String key = it.next();
+		for(String key : keys) {
             sb.append(" ").append(key);
         }
         sb.append("\r\n");
         List<ReplyLine> lst = sendAndWaitForResponse(sb.toString(), null);
         List<ConfigEntry> result = new ArrayList<ConfigEntry>();
-        for (Iterator<ReplyLine> it = lst.iterator(); it.hasNext(); ) {
-            String kv = (it.next()).msg;
+		for(ReplyLine line : lst) {
+			String kv = line.msg;
             int idx = kv.indexOf('=');
-            if (idx >= 0)
-                result.add(new ConfigEntry(kv.substring(0, idx),
-                                           kv.substring(idx+1)));
-            else
+			if(idx >= 0) {
+				String key = kv.substring(0, idx);
+				String value = kv.substring(idx + 1);
+				result.add(new ConfigEntry(key, value));
+			} else {
                 result.add(new ConfigEntry(kv));
         }
+		}
         return result;
     }
 
@@ -437,37 +407,41 @@
      * Each element of <b>events</b> is one of the following Strings: 
      * ["CIRC" | "STREAM" | "ORCONN" | "BW" | "DEBUG" |
      *  "INFO" | "NOTICE" | "WARN" | "ERR" | "NEWDESC" | "ADDRMAP"] .
-     * 
+	 * <p>
      * Any events not listed in the <b>events</b> are turned off; thus, calling
-     * setEvents with an empty <b>events</b> argument turns off all event reporting.
+	 * setEvents with an empty <b>events</b> argument turns off all event
+	 * reporting.
      */
     public void setEvents(List<String> events) throws IOException {
         StringBuffer sb = new StringBuffer("SETEVENTS");
-        for (Iterator<String> it = events.iterator(); it.hasNext(); ) {
-            sb.append(" ").append(it.next());
+		for(String event : events) {
+			sb.append(" ").append(event);
         }
         sb.append("\r\n");
         sendAndWaitForResponse(sb.toString(), null);
     }
 
     /** Authenticates the controller to the Tor server.
-     *
+	 * <p>
      * By default, the current Tor implementation trusts all local users, and 
-     * the controller can authenticate itself by calling authenticate(new byte[0]).
-     *
-     * If the 'CookieAuthentication' option is true, Tor writes a "magic cookie"
-     * file named "control_auth_cookie" into its data directory.  To authenticate,
-     * the controller must send the contents of this file in <b>auth</b>.
-     * 
-     * If the 'HashedControlPassword' option is set, <b>auth</b> must contain the salted
-     * hash of a secret password.  The salted hash is computed according to the
-     * S2K algorithm in RFC 2440 (OpenPGP), and prefixed with the s2k specifier.
-     * This is then encoded in hexadecimal, prefixed by the indicator sequence
-     * "16:".
-     *
+	 * the controller can authenticate itself by calling
+	 * authenticate(new byte[0]).
+	 * <p>
+	 * If the 'CookieAuthentication' option is true, Tor writes a "magic
+	 * cookie" file named "control_auth_cookie" into its data directory.  To
+	 * authenticate, the controller must send the contents of this file in
+	 * <b>auth</b>.
+	 * <p>
+	 * If the 'HashedControlPassword' option is set, <b>auth</b> must contain
+	 * the salted hash of a secret password.  The salted hash is computed
+	 * according to the S2K algorithm in RFC 2440 (OpenPGP), and prefixed with
+	 * the s2k specifier.  This is then encoded in hexadecimal, prefixed by the
+	 * indicator sequence "16:".
+	 * <p>
      * You can generate the salt of a password by calling
-     *       'tor --hash-password <password>'
+	 * <tt>'tor --hash-password &lt;password&gt;'</tt>
      * or by using the provided PasswordDigest class.
+	 * <p>
      * To authenticate under this scheme, the controller sends Tor the original
      * secret that was used to generate the password.
      */
@@ -476,7 +450,8 @@
         sendAndWaitForResponse(cmd, null);
     }
 
-    /** Instructs the server to write out its configuration options into its torrc.
+	/** Instructs the server to write out its configuration options into its
+	 * torrc.
      */
     public void saveConf() throws IOException {
         sendAndWaitForResponse("SAVECONF\r\n", null);
@@ -503,234 +478,239 @@
     public void shutdownTor(String signal) throws IOException {
         String s = "SIGNAL " + signal + "\r\n";
         Waiter w = new Waiter();
-        if (debugOutput != null)
-            debugOutput.print(">> "+s);
-        if (this.thread != null) {
-            this.thread.stopListening();
-    	}
-        synchronized (waiters) {
+		if(debugOutput != null) debugOutput.print(">> " + s);
+		synchronized(waiters) {
             output.write(s);
             output.flush();
             waiters.addLast(w); // Prevent react() from finding the list empty
         }
     }
 
-    /** Tells the Tor server that future SOCKS requests for connections to a set of original
-     * addresses should be replaced with connections to the specified replacement
-     * addresses.  Each element of <b>kvLines</b> is a String of the form
-     * "old-address new-address".  This function returns the new address mapping.
-     *
+	/** Tells the Tor server that future SOCKS requests for connections to a
+	 * set of original addresses should be replaced with connections to the
+	 * specified replacement addresses.  Each element of <b>kvLines</b> is a
+	 * String of the form "old-address new-address".  This function returns the
+	 * new address mapping.
+	 * <p>
      * The client may decline to provide a body for the original address, and
-     * instead send a special null address ("0.0.0.0" for IPv4, "::0" for IPv6, or
-     * "." for hostname), signifying that the server should choose the original
-     * address itself, and return that address in the reply.  The server
-     * should ensure that it returns an element of address space that is unlikely
-     * to be in actual use.  If there is already an address mapped to the
-     * destination address, the server may reuse that mapping.
-     * 
-     * If the original address is already mapped to a different address, the old
-     * mapping is removed.  If the original address and the destination address
-     * are the same, the server removes any mapping in place for the original
-     * address.
-     *
-     * Mappings set by the controller last until the Tor process exits:
-     * they never expire. If the controller wants the mapping to last only
-     * a certain time, then it must explicitly un-map the address when that
-     * time has elapsed.
+	 * instead send a special null address ("0.0.0.0" for IPv4, "::0" for IPv6,
+	 * or "." for hostname), signifying that the server should choose the
+	 * original address itself, and return that address in the reply.  The
+	 * server should ensure that it returns an element of address space that is
+	 * unlikely to be in actual use.  If there is already an address mapped to
+	 * the destination address, the server may reuse that mapping.
+	 * <p>
+	 * If the original address is already mapped to a different address, the
+	 * old mapping is removed.  If the original address and the destination
+	 * address are the same, the server removes any mapping in place for the
+	 * original address.
+	 * <p>
+	 * Mappings set by the controller last until the Tor process exits: they
+	 * never expire. If the controller wants the mapping to last only a certain
+	 * time, then it must explicitly un-map the address when that time has
+	 * elapsed.
      */
-    public Map<String,String> mapAddresses(Collection<String> kvLines) throws IOException {
+	public Map<String, String> mapAddresses(Collection<String> kvLines)
+			throws IOException {
         StringBuffer sb = new StringBuffer("MAPADDRESS");
-        for (Iterator<String> it = kvLines.iterator(); it.hasNext(); ) {
-            String kv = it.next();
-            int i = kv.indexOf(' ');
-            sb.append(" ").append(kv.substring(0,i)).append("=")
-                .append(quote(kv.substring(i+1)));
+		for(String kv : kvLines) {
+			int idx = kv.indexOf(' ');
+			sb.append(" ").append(kv.substring(0, idx));
+			sb.append("=").append(quote(kv.substring(idx + 1)));
         }
         sb.append("\r\n");
         List<ReplyLine> lst = sendAndWaitForResponse(sb.toString(), null);
-        Map<String,String> result = new HashMap<String,String>();
-        for (Iterator<ReplyLine> it = lst.iterator(); it.hasNext(); ) {
-            String kv = (it.next()).msg;
+		Map<String, String> result = new HashMap<String, String>();
+		for(ReplyLine line : lst) {
+			String kv = line.msg;
             int idx = kv.indexOf('=');
-            result.put(kv.substring(0, idx),
-                       kv.substring(idx+1));
+			result.put(kv.substring(0, idx), kv.substring(idx + 1));
         }
         return result;
     }
 
-    public Map<String,String> mapAddresses(Map<String,String> addresses) throws IOException {
+	public Map<String, String> mapAddresses(Map<String, String> addresses)
+			throws IOException {
         List<String> kvList = new ArrayList<String>();
-        for (Iterator<Map.Entry<String, String>> it = addresses.entrySet().iterator(); it.hasNext(); ) {
-            Map.Entry<String,String> e = it.next();
-            kvList.add(e.getKey()+" "+e.getValue());
+		for(Map.Entry<String, String> e : addresses.entrySet()) {
+			kvList.add(e.getKey() + " " + e.getValue());
         }
         return mapAddresses(kvList);
     }
 
-    public String mapAddress(String fromAddr, String toAddr) throws IOException {
+	public String mapAddress(String fromAddr, String toAddr)
+			throws IOException {
         List<String> lst = new ArrayList<String>();
-        lst.add(fromAddr+" "+toAddr+"\n");
-        Map<String,String> m = mapAddresses(lst);
+		lst.add(fromAddr + " " + toAddr + "\n");
+		Map<String, String> m = mapAddresses(lst);
         return m.get(fromAddr);
     }
 
-    /** Queries the Tor server for keyed values that are not stored in the torrc
-     * configuration file.  Returns a map of keys to values.
-     *
+	/** Queries the Tor server for keyed values that are not stored in the
+	 * torrc configuration file.  Returns a map of keys to values.
+	 * <p>
      * Recognized keys include:
      * <ul>
      * <li>"version" : The version of the server's software, including the name
      *  of the software. (example: "Tor 0.0.9.4")</li>
-     * <li>"desc/id/<OR identity>" or "desc/name/<OR nickname>" : the latest server
-     * descriptor for a given OR, NUL-terminated.  If no such OR is known, the
-     * corresponding value is an empty string.</li>
-     * <li>"network-status" : a space-separated list of all known OR identities.
-     * This is in the same format as the router-status line in directories;
-     * see tor-spec.txt for details.</li>
+	 * <li>"desc/id/<OR identity>" or "desc/name/<OR nickname>" : the latest
+	 * server descriptor for a given OR, NUL-terminated.  If no such OR is
+	 * known, the corresponding value is an empty string.</li>
+	 * <li>"network-status" : a space-separated list of all known OR
+	 * identities.  This is in the same format as the router-status line in
+	 * directories; see tor-spec.txt for details.</li>
      * <li>"addr-mappings/all"</li>
      * <li>"addr-mappings/config"</li>
      * <li>"addr-mappings/cache"</li>
-     * <li>"addr-mappings/control" : a space-separated list of address mappings, each
-     * in the form of "from-address=to-address".  The 'config' key
-     * returns those address mappings set in the configuration; the 'cache'
+	 * <li>"addr-mappings/control" : a space-separated list of address
+	 * mappings, each in the form of "from-address=to-address".  The 'config'
+	 * key returns those address mappings set in the configuration; the 'cache'
      * key returns the mappings in the client-side DNS cache; the 'control'
      * key returns the mappings set via the control interface; the 'all'
      * target returns the mappings set through any mechanism.</li>
-     * <li>"circuit-status" : A series of lines as for a circuit status event. Each line is of the form:
-     * "CircuitID CircStatus Path"</li>
-     * <li>"stream-status" : A series of lines as for a stream status event.  Each is of the form:
-     * "StreamID StreamStatus CircID Target"</li>
-     * <li>"orconn-status" : A series of lines as for an OR connection status event.  Each is of the
-     * form: "ServerID ORStatus"</li>
+	 * <li>"circuit-status" : A series of lines as for a circuit status event.
+	 * Each line is of the form: "CircuitID CircStatus Path"</li>
+	 * <li>"stream-status" : A series of lines as for a stream status event.
+	 * Each is of the form: "StreamID StreamStatus CircID Target"</li>
+	 * <li>"orconn-status" : A series of lines as for an OR connection status
+	 * event.  Each is of the form: "ServerID ORStatus"</li>
      * </ul>
      */
-    public Map<String,String> getInfo(Collection<String> keys) throws IOException {
+	public Map<String, String> getInfo(Collection<String> keys)
+			throws IOException {
         StringBuffer sb = new StringBuffer("GETINFO");
-        for (Iterator<String> it = keys.iterator(); it.hasNext(); ) {
-            sb.append(" ").append(it.next());
+		for(String key : keys) {
+			sb.append(" ").append(key);
         }
         sb.append("\r\n");
         List<ReplyLine> lst = sendAndWaitForResponse(sb.toString(), null);
-        Map<String,String> m = new HashMap<String,String>();
-        for (Iterator<ReplyLine> it = lst.iterator(); it.hasNext(); ) {
-            ReplyLine line = it.next();
+		Map<String, String> m = new HashMap<String, String>();
+		for(ReplyLine line : lst) {
             int idx = line.msg.indexOf('=');
-            if (idx<0)
-                break;
-            String k = line.msg.substring(0,idx);
+			if(idx < 0) break;
+			String k = line.msg.substring(0, idx);
             String v;
-            if (line.rest != null) {
-                v = line.rest;
-            } else {
-                v = line.msg.substring(idx+1);
-            }
+			if(line.rest != null) v = line.rest;
+			else v = line.msg.substring(idx + 1);
             m.put(k, v);
         }
         return m;
     }
     
-    
-    
-    /** Return the value of the information field 'key' */
+	/** Returns the value of the information field 'key' */
     public String getInfo(String key) throws IOException {
-        List<String> lst = new ArrayList<String>();
-        lst.add(key);
-        Map<String,String> m = getInfo(lst);
+		Map<String, String> m = getInfo(Arrays.asList(key));
         return  m.get(key);
     }
 
-    /** An extendCircuit request takes one of two forms: either the <b>circID</b> is zero, in
-     * which case it is a request for the server to build a new circuit according
-     * to the specified path, or the <b>circID</b> is nonzero, in which case it is a
-     * request for the server to extend an existing circuit with that ID according
-     * to the specified <b>path</b>.
-     *
-     * If successful, returns the Circuit ID of the (maybe newly created) circuit.
+	/** An extendCircuit request takes one of two forms: either the
+	 * <b>circID</b> is zero, in which case it is a request for the server to
+	 * build a new circuit according to the specified path, or the
+	 * <b>circID</b> is nonzero, in which case it is a request for the server
+	 * to extend an existing circuit with that ID according to the specified
+	 * <b>path</b>.
+	 * <p>
+	 * If successful, returns the Circuit ID of the (maybe newly created)
+	 * circuit.
      */
     public String extendCircuit(String circID, String path) throws IOException {
-        List<ReplyLine> lst = sendAndWaitForResponse(
-                          "EXTENDCIRCUIT "+circID+" "+path+"\r\n", null);
-        return (lst.get(0)).msg;
+		String cmd = "EXTENDCIRCUIT " + circID + " " + path + "\r\n";
+		List<ReplyLine> lst = sendAndWaitForResponse(cmd, null);
+		return lst.get(0).msg;
     }
     
-    /** Informs the Tor server that the stream specified by <b>streamID</b> should be
-     * associated with the circuit specified by <b>circID</b>.  
-     * 
-     * Each stream may be associated with
-     * at most one circuit, and multiple streams may share the same circuit.
-     * Streams can only be attached to completed circuits (that is, circuits that
-     * have sent a circuit status "BUILT" event or are listed as built in a
-     * getInfo circuit-status request).
-     * 
+	/** Informs the Tor server that the stream specified by <b>streamID</b>
+	 * should be associated with the circuit specified by <b>circID</b>.  
+	 * <p>
+	 * Each stream may be associated with at most one circuit, and multiple
+	 * streams may share the same circuit.  Streams can only be attached to
+	 * completed circuits (that is, circuits that have sent a circuit status
+	 * "BUILT" event or are listed as built in a getInfo circuit-status
+	 * request).
+	 * <p>
      * If <b>circID</b> is 0, responsibility for attaching the given stream is
      * returned to Tor.
-     * 
-     * By default, Tor automatically attaches streams to
-     * circuits itself, unless the configuration variable
-     * "__LeaveStreamsUnattached" is set to "1".  Attempting to attach streams
-     * via TC when "__LeaveStreamsUnattached" is false may cause a race between
-     * Tor and the controller, as both attempt to attach streams to circuits.
+	 * <p>
+	 * By default, Tor automatically attaches streams to circuits itself,
+	 * unless the configuration variable "__LeaveStreamsUnattached" is set to
+	 * "1".  Attempting to attach streams via TC when
+	 * "__LeaveStreamsUnattached" is false may cause a race between Tor and the
+	 * controller, as both attempt to attach streams to circuits.
      */
     public void attachStream(String streamID, String circID)
         throws IOException {
-        sendAndWaitForResponse("ATTACHSTREAM "+streamID+" "+circID+"\r\n", null);
+		String cmd = "ATTACHSTREAM " + streamID + " " + circID + "\r\n";
+		sendAndWaitForResponse(cmd, null);
     }
 
     /** Tells Tor about the server descriptor in <b>desc</b>.
-     * 
+	 * <p>
      * The descriptor, when parsed, must contain a number of well-specified
      * fields, including fields for its nickname and identity.
      */
     // More documentation here on format of desc?
     // No need for return value?  control-spec.txt says reply is merely "250 OK" on success...
     public String postDescriptor(String desc) throws IOException {
-        List<ReplyLine> lst = sendAndWaitForResponse("+POSTDESCRIPTOR\r\n", desc);
-        return (lst.get(0)).msg;
+		String cmd = "+POSTDESCRIPTOR\r\n";
+		List<ReplyLine> lst = sendAndWaitForResponse(cmd, desc);
+		return lst.get(0).msg;
     }
 
-    /** Tells Tor to change the exit address of the stream identified by <b>streamID</b>
-     * to <b>address</b>. No remapping is performed on the new provided address.
-     * 
-     * To be sure that the modified address will be used, this event must be sent
-     * after a new stream event is received, and before attaching this stream to
-     * a circuit.
-     */
-    public void redirectStream(String streamID, String address) throws IOException {
-        sendAndWaitForResponse("REDIRECTSTREAM "+streamID+" "+address+"\r\n",
-                               null);
+	/** Tells Tor to change the exit address of the stream identified by
+	 * <b>streamID</b> to <b>address</b>. No remapping is performed on the new
+	 * provided address.
+	 * <p>
+	 * To be sure that the modified address will be used, this event must be
+	 * sent after a new stream event is received, and before attaching this
+	 * stream to a circuit.
+	 */
+	public void redirectStream(String streamID, String address)
+			throws IOException {
+		String cmd = "REDIRECTSTREAM " + streamID + " " + address + "\r\n";
+		sendAndWaitForResponse(cmd, null);
     }
 
     /** Tells Tor to close the stream identified by <b>streamID</b>.
-     * <b>reason</b> should be one of the Tor RELAY_END reasons given in tor-spec.txt, as a decimal:
+	 * <b>reason</b> should be one of the Tor RELAY_END reasons given in
+	 * tor-spec.txt, as a decimal:
      * <ul>
      * <li>1 -- REASON_MISC           (catch-all for unlisted reasons)</li>
      * <li>2 -- REASON_RESOLVEFAILED  (couldn't look up hostname)</li>
      * <li>3 -- REASON_CONNECTREFUSED (remote host refused connection)</li>
-     * <li>4 -- REASON_EXITPOLICY     (OR refuses to connect to host or port)</li>
+	 * <li>4 -- REASON_EXITPOLICY     (OR refuses to connect to host or
+	 * port)</li>
      * <li>5 -- REASON_DESTROY        (Circuit is being destroyed)</li>
-     * <li>6 -- REASON_DONE           (Anonymized TCP connection was closed)</li>
-     * <li>7 -- REASON_TIMEOUT        (Connection timed out, or OR timed out while connecting)</li>
+	 * <li>6 -- REASON_DONE           (Anonymized TCP connection was
+	 * closed)</li>
+	 * <li>7 -- REASON_TIMEOUT        (Connection timed out, or OR timed out
+	 * while connecting)</li>
      * <li>8 -- (unallocated)</li>
      * <li>9 -- REASON_HIBERNATING    (OR is temporarily hibernating)</li>
      * <li>10 -- REASON_INTERNAL       (Internal error at the OR)</li>
-     * <li>11 -- REASON_RESOURCELIMIT  (OR has no resources to fulfill request)</li>
+	 * <li>11 -- REASON_RESOURCELIMIT  (OR has no resources to fulfill
+	 * request)</li>
      * <li>12 -- REASON_CONNRESET      (Connection was unexpectedly reset)</li>
-     * <li>13 -- REASON_TORPROTOCOL    (Sent when closing connection because of Tor protocol violations)</li>
+	 * <li>13 -- REASON_TORPROTOCOL    (Sent when closing connection because of
+	 * Tor protocol violations)</li>
      * </ul>
-     *
-     * Tor may hold the stream open for a while to flush any data that is pending.
+	 * Tor may hold the stream open for a while to flush any data that is
+	 * pending.
      */
-    public void closeStream(String streamID, byte reason)
-        throws IOException {
-        sendAndWaitForResponse("CLOSESTREAM "+streamID+" "+reason+"\r\n",null);
+	public void closeStream(String streamID, byte reason) throws IOException {
+		String cmd = "CLOSESTREAM " + streamID + " " + reason + "\r\n";
+		sendAndWaitForResponse(cmd, null);
     }
 
     /** Tells Tor to close the circuit identified by <b>circID</b>.
-     * If <b>ifUnused</b> is true, do not close the circuit unless it is unused.
+	 * If <b>ifUnused</b> is true, do not close the circuit unless it is
+	 * unused.
      */
-    public void closeCircuit(String circID, boolean ifUnused) throws IOException {
-        sendAndWaitForResponse("CLOSECIRCUIT "+circID+
-                               (ifUnused?" IFUNUSED":"")+"\r\n", null);
+	public void closeCircuit(String circID, boolean ifUnused)
+			throws IOException {
+		String cmd;
+		if(ifUnused) cmd = "CLOSECIRCUIT " + circID + " IFUNUSED\r\n";
+		else cmd = "CLOSECIRCUIT " + circID + "\r\n";
+		sendAndWaitForResponse(cmd, null);
     }
 }
 
diff -Bbur jtorctl/net/freehaven/tor/control/TorControlError.java jtorctl-briar/net/freehaven/tor/control/TorControlError.java
--- jtorctl/net/freehaven/tor/control/TorControlError.java	2013-04-24 16:46:08.000000000 +0100
+++ jtorctl-briar/net/freehaven/tor/control/TorControlError.java	2013-05-16 19:56:30.000000000 +0100
@@ -2,13 +2,15 @@
 // See LICENSE file for copying information
 package net.freehaven.tor.control;
 
-/**
- * An exception raised when Tor tells us about an error.
- */
-public class TorControlError extends RuntimeException {
-    static final long serialVersionUID = 2;
+import java.io.IOException;
+
+/** An exception raised when Tor tells us about an error. */
+public class TorControlError extends IOException {
+
+	private static final long serialVersionUID = 2;
+
+	private final int errorType;
 
-    int errorType;
     public TorControlError(int type, String s) {
         super(s);
         errorType = type;
@@ -19,13 +23,13 @@
     public int getErrorType() {
         return errorType;
     }
+
     public String getErrorMsg() {
         try {
-            if (errorType == -1)
-                return null;
+			if(errorType == -1) return null;
             return TorControlCommands.ERROR_MSGS[errorType];
-        } catch (ArrayIndexOutOfBoundsException ex) {
-            return "Unrecongized error #"+errorType;
+		} catch(ArrayIndexOutOfBoundsException ex) {
+			return "Unrecongized error #" + errorType;
         }
     }
 }
diff -Bbur jtorctl/net/freehaven/tor/control/TorControlSyntaxError.java jtorctl-briar/net/freehaven/tor/control/TorControlSyntaxError.java
--- jtorctl/net/freehaven/tor/control/TorControlSyntaxError.java	2013-04-24 16:46:08.000000000 +0100
+++ jtorctl-briar/net/freehaven/tor/control/TorControlSyntaxError.java	2013-05-16 19:56:30.000000000 +0100
@@ -2,12 +2,15 @@
 // See LICENSE file for copying information
 package net.freehaven.tor.control;
 
-/**
- * An exception raised when Tor behaves in an unexpected way.
- */
-public class TorControlSyntaxError extends RuntimeException {
-    static final long serialVersionUID = 2;
+import java.io.IOException;
 
-    public TorControlSyntaxError(String s) { super(s); }
+/** An exception raised when Tor behaves in an unexpected way. */
+public class TorControlSyntaxError extends IOException {
+
+	private static final long serialVersionUID = 2;
+
+	public TorControlSyntaxError(String s) {
+		super(s);
+	}
 }