Merge remote-tracking branch 'public/xxx_fixups' into maint-0.2.2

Conflicts:
	src/or/or.h

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

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

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

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

diff --cc src/or/or.h
index 3cadd3173ee8d5bae345963f82812e16e9cb3692,e44c626d73c1852e82b88a56d684a2a6c7ed6717..1688a08f9641b1d3e79b150012a8346b5a73b5a1
--- 1/src/or/or.h
--- 2/src/or/or.h
+++ b/src/or/or.h
@@@ -2126,9 -2126,16 +2126,15 @@@ typedef struct circuit_t 
      * length ONIONSKIN_CHALLENGE_LEN. */
    char *n_conn_onionskin;
  
 -  time_t timestamp_created; /**< When was this circuit created? */
 +  struct timeval timestamp_created; /**< When was the circuit created? */
-   time_t timestamp_dirty; /**< When the circuit was first used, or 0 if the
-                            * circuit is clean. */
+   /** When the circuit was first used, or 0 if the circuit is clean.
+    *
+    * XXXX023 Note that some code will artifically adjust this value backward
+    * in time in order to indicate that a circuit shouldn't be used for new
+    * streams, but that it can stay alive as long as it has streams on it.
+    * That's a kludge we should fix.
+    */
+   time_t timestamp_dirty;
 -  struct timeval highres_created; /**< When exactly was the circuit created? */
  
    uint16_t marked_for_close; /**< Should we close this circuit at the end of
                                * the main loop? (If true, holds the line number

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