changes entry for bug 1741

diff --git a/changes/ancient-nondirty-circuits b/changes/ancient-nondirty-circuits
new file mode 100644 (file)
index 0000000..9858cd1
--- /dev/null
+++ b/changes/ancient-nondirty-circuits
@@ -0,0 +1,4 @@
+  o Minor bugfixes:
+    - Fix to remove a spurious hidden service server-side log notice about
+      "Ancient non-dirty circuits". Bugfix on 0.2.2.14-alpha; fixes
+      bug 1741.

diff --git a/src/or/circuituse.c b/src/or/circuituse.c
index 65ecb5433cb6c2b99ebced32da98a5bba6e4c9a4..0429ca9cc936837d443e89fa8d41236c3c94cf35 100644 (file)
--- a/src/or/circuituse.c
+++ b/src/or/circuituse.c
@@ -748,7 +748,8 @@ circuit_expire_old_circuits_clientside(time_t now)
         } else if (!TO_ORIGIN_CIRCUIT(circ)->is_ancient) {
           /* Server side rend joined circuits can end up really old, because
            * they are reused by clients for longer than normal. The client
-           * controls their lifespan. */
+           * controls their lifespan. (They never become dirty, because
+           * connection_exit_begin_conn() never marks anything as dirty.) */
           if (circ->purpose != CIRCUIT_PURPOSE_S_REND_JOINED) {
             log_notice(LD_CIRC,
                        "Ancient non-dirty circuit %d is still around after "
@@ -756,6 +757,8 @@ circuit_expire_old_circuits_clientside(time_t now)
                        TO_ORIGIN_CIRCUIT(circ)->global_identifier,
                        (long)(now - circ->timestamp_created),
                        circ->purpose);
+            /* FFFF implement a new circuit_purpose_to_string() so we don't
+             * just print out a number for circ->purpose */
             TO_ORIGIN_CIRCUIT(circ)->is_ancient = 1;
           }
         }