[tor-commits] [tor/release-0.2.2] Merge remote-tracking branch 'public/xxx_fixups' into maint-0.2.2

[arma at torproject.org]

commit ba0cd8094f8e6ae0113ad69958d9d0973bb1f2c3
Merge: 118d8ff fc64783
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Apr 7 12:03:04 2011 -0400

    Merge remote-tracking branch 'public/xxx_fixups' into maint-0.2.2
    
    Conflicts:
    	src/or/or.h

 changes/bug539_removal        |    6 +++
 changes/connect_err_reporting |    6 +++
 changes/count_overflow        |    5 +++
 changes/full_ap_circuits      |    6 +++
 changes/kill_ftime            |    7 ++++
 changes/noroute               |    5 +++
 src/common/address.c          |   20 ++++++-----
 src/common/compat_libevent.c  |   17 +++------
 src/common/memarea.c          |    7 +++-
 src/common/util.c             |   77 -----------------------------------------
 src/common/util.h             |   10 -----
 src/or/buffers.c              |    6 ++--
 src/or/circuitbuild.c         |    9 +++--
 src/or/circuitlist.c          |    3 ++
 src/or/circuituse.c           |    5 ++-
 src/or/config.c               |    6 ++--
 src/or/connection.c           |   36 ++++++++++++-------
 src/or/connection_edge.c      |   30 +++++++++++-----
 src/or/connection_or.c        |    6 +++-
 src/or/directory.c            |   37 ++++++++------------
 src/or/dirserv.c              |   11 ++++--
 src/or/dns.c                  |    2 +-
 src/or/dnsserv.c              |    2 +-
 src/or/eventdns.c             |    2 +-
 src/or/geoip.c                |    5 ++-
 src/or/networkstatus.c        |   11 ++++--
 src/or/or.h                   |   12 +++++--
 src/or/reasons.c              |    8 +----
 src/or/relay.c                |    2 +
 src/or/rendclient.c           |    4 +-
 src/or/rendcommon.c           |    2 +-
 src/or/rephist.c              |    2 +-
 src/or/routerlist.c           |   18 +++++-----
 src/or/routerparse.c          |    2 +-
 34 files changed, 184 insertions(+), 203 deletions(-)

diff --cc src/or/or.h
index 3cadd31,e44c626..1688a08
--- a/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