From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 26 Aug 2009 15:27:19 +0000 (-0400)
Subject: Merge commit 'public/socks-client'
X-Git-Tag: tor-0.2.2.1-alpha~11
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=707a6bd6595024e0b4a998e0a99eb284499a37e3;p=thirdparty%2Ftor.git

Merge commit 'public/socks-client'

Resolved conflict in:
	src/or/or.h
---

707a6bd6595024e0b4a998e0a99eb284499a37e3
diff --cc src/or/or.h
index 4d808fc3e3,bb6cee1ba5..df57f3048d
--- a/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