tor

commit d253b31cec04c35c551618b9b1ffa50ae4426303
parent 31fb2bceb546fb84899e5c797e3f101b86dd8687
Author: teor <teor@torproject.org>
Date:   Mon, 12 Aug 2019 09:54:35 +1000

Merge remote-tracking branch 'tor-github/pr/1077' into maint-0.3.5

Diffstat:
A
changes/bug29034
 | 
5
+++++
M
src/core/or/circuituse.c
 | 
6
++++++

2 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/changes/bug29034 b/changes/bug29034
@@ -0,0 +1,5 @@
+  o Major bugfixes (Onion service reachability):
+    - Properly clean up the introduction point map when circuits change purpose
+      from onion service circuits to pathbias, measurement, or other circuit types.
+      This should fix some service-side instances of introduction point failure.
+      Fixes bug 29034; bugfix on 0.3.2.1-alpha.
diff --git a/src/core/or/circuituse.c b/src/core/or/circuituse.c
@@ -3066,6 +3066,12 @@ circuit_change_purpose(circuit_t *circ, uint8_t new_purpose)
               circ->purpose,
               circuit_purpose_to_string(new_purpose),
               new_purpose);
+
+    /* Take specific actions if we are repurposing a hidden service circuit. */
+    if (circuit_purpose_is_hidden_service(circ->purpose) &&
+        !circuit_purpose_is_hidden_service(new_purpose)) {
+      hs_circ_cleanup(circ);
+    }
   }
 
   old_purpose = circ->purpose;