Merge branch '024_msvc_squashed'

Conflicts:
	src/or/or.h
	 srcwin32/orconfig.h

diff --cc src/common/compat.h
Simple merge

diff --cc src/common/crypto.c
Simple merge

diff --cc src/common/torint.h
Simple merge

diff --cc src/common/tortls.c
index 1d093dfcba9c9b6ce4e997c94211227e68f78277,1e018150954b4e6ffbe59d9febd5fa7d1e4018a0..251915d9850fdb4fb07ebb48d37ecda4e5ef1aa8
--- 1/src/common/tortls.c
--- 2/src/common/tortls.c
+++ b/src/common/tortls.c
@@@ -127,26 -127,14 +127,32 @@@ typedef struct tor_tls_context_t 
    crypto_pk_t *auth_key;
  } tor_tls_context_t;
  
 +/** Return values for tor_tls_classify_client_ciphers.
 + *
 + * @{
 + */
 +/** An error occurred when examining the client ciphers */
 +#define CIPHERS_ERR -1
 +/** The client cipher list indicates that a v1 handshake was in use. */
 +#define CIPHERS_V1 1
 +/** The client cipher list indicates that the client is using the v2 or the
 + * v3 handshake, but that it is (probably!) lying about what ciphers it
 + * supports */
 +#define CIPHERS_V2 2
 +/** The client cipher list indicates that the client is using the v2 or the
 + * v3 handshake, and that it is telling the truth about what ciphers it
 + * supports */
 +#define CIPHERS_UNRESTRICTED 3
 +/** @} */
 +
  #define TOR_TLS_MAGIC 0x71571571
  
+ typedef enum {
+     TOR_TLS_ST_HANDSHAKE, TOR_TLS_ST_OPEN, TOR_TLS_ST_GOTCLOSE,
+     TOR_TLS_ST_SENTCLOSE, TOR_TLS_ST_CLOSED, TOR_TLS_ST_RENEGOTIATE,
+     TOR_TLS_ST_BUFFEREVENT
+ } tor_tls_state_t;
+ 
  /** Holds a SSL object and its associated data.  Members are only
   * accessed from within tortls.c.
   */

diff --cc src/common/util.c
Simple merge

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

diff --cc src/or/channel.h
Simple merge

diff --cc src/or/or.h
index eaa6010dc293767347293c4689e0bf5cf5b91c18,6ec7c3a79caff7120b2d7c7c3bcedcb062b985c2..a6f3d3e88ab4ae041ac70b076887de045072718f
--- 1/src/or/or.h
--- 2/src/or/or.h
+++ b/src/or/or.h
@@@ -2887,15 -2849,7 +2890,15 @@@ typedef struct origin_circuit_t 
  
    /** Kludge to help us prevent the warn in bug #6475 and eventually
     * debug why we are not seeing first hops in some cases. */
-   path_state_t path_state : 3;
 -  ENUM_BF(path_state_t) path_state : 2;
++  ENUM_BF(path_state_t) path_state : 3;
 +
 +  /** For path probing. Store the temporary probe stream ID
 +   * for response comparison */
 +  streamid_t pathbias_probe_id;
 +
 +  /** For path probing. Store the temporary probe address nonce
 +   * (in host byte order) for response comparison. */
 +  uint32_t pathbias_probe_nonce;
  
    /** Set iff this is a hidden-service circuit which has timed out
     * according to our current circuit-build timeout, but which has

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

diff --cc src/win32/orconfig.h
Simple merge