tor

commit 8500f0e4e179280ebb8d6c1f3342eff21a4fdac2
parent 2b94b0ea721f2bd0127d097860ef64b915e2781a
Author: Nick Mathewson <nickm@torproject.org>
Date:   Tue,  1 Aug 2017 11:28:36 -0400

Merge remote-tracking branch 'public/bug20059_024_v2' into maint-0.2.9

Diffstat:
A
changes/bug20059
 | 
3
+++
M
src/or/onion.c
 | 
4
+++-

2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/changes/bug20059 b/changes/bug20059
@@ -0,0 +1,3 @@
+  o Minor bugfixes (relay):
+    - Avoid a double-marked-circuit warning that can happen when we receive
+      DESTROY cells under heavy load. Fixes bug 20059; bugfix on 0.1.0.1-rc.
diff --git a/src/or/onion.c b/src/or/onion.c
@@ -235,7 +235,9 @@ onion_pending_add(or_circuit_t *circ, create_cell_t *onionskin)
     onion_queue_entry_remove(head);
     log_info(LD_CIRC,
              "Circuit create request is too old; canceling due to overload.");
-    circuit_mark_for_close(TO_CIRCUIT(circ), END_CIRC_REASON_RESOURCELIMIT);
+    if (! TO_CIRCUIT(circ)->marked_for_close) {
+      circuit_mark_for_close(TO_CIRCUIT(circ), END_CIRC_REASON_RESOURCELIMIT);
+    }
   }
   return 0;
 }