Merge commit 'public/socks-client'

Resolved conflict in:
	src/or/or.h

diff --cc doc/tor.1.in
Simple merge

diff --cc src/or/buffers.c
Simple merge

diff --cc src/or/config.c
Simple merge

diff --cc src/or/connection.c
Simple merge

diff --cc src/or/directory.c
Simple merge

diff --cc src/or/or.h
index 4d808fc3e3caaa74e18300a6dc7057fc9cdcabec,bb6cee1ba54b3eda764e0270e0964390758804a3..df57f3048d75c45dd1b070584e6a05a61bdc99c5
--- 1/src/or/or.h
--- 2/src/or/or.h
+++ b/src/or/or.h
@@@ -932,6 -934,6 +945,9 @@@ typedef struct connection_t 
     * connection. */
    unsigned int linked_conn_is_closed:1;
  
++  /** CONNECT/SOCKS proxy client handshake state (for outgoing connections). */
++  unsigned int proxy_state:4;
++
    /** Our socket; -1 if this connection is closed, or has no socket. */
    evutil_socket_t s;
    int conn_array_index; /**< Index into the global connection array. */
@@@ -975,10 -977,9 +991,11 @@@
     * to the evdns_server_port is uses to listen to and answer connections. */
    struct evdns_server_port *dns_server_port;
  
 -  /** CONNECT/SOCKS proxy client handshake state (for outgoing connections). */
 -  unsigned int proxy_state:4;
 +#ifdef ENABLE_DIRREQ_STATS
 +  /** Unique ID for measuring tunneled network status requests. */
 +  uint64_t dirreq_id;
 +#endif
+ 
  } connection_t;
  
  /** Stores flags and information related to the portion of a v2 Tor OR