List service address in CIRC events for HS-related circs

2 files changed, 13 insertions, 3 deletions

diff --git a/changes/feature2411 b/changes/feature2411
index e029162164..633a5cebd3 100644
--- a/changes/feature2411
+++ b/changes/feature2411
@@ -4,8 +4,9 @@
       controllers in CIRC events and in replies to 'GETINFO
       circuit-status'.  Implements part of ticket 2411.
 
-    - Report the current state of a hidden-service-related circuit to
-      controllers in CIRC events and in replies to 'GETINFO
-      circuit-status'.  Implements part of ticket 2411.
+    - Report the hidden service address and current state of a
+      hidden-service-related circuit to controllers in CIRC events and
+      in replies to 'GETINFO circuit-status'.  Implements part of
+      ticket 2411.
 
 
diff --git a/src/or/control.c b/src/or/control.c
index 6b7f9dc7a0..42eaed2765 100644
--- a/src/or/control.c
+++ b/src/or/control.c
@@ -1842,6 +1842,15 @@ circuit_describe_status_for_controller(origin_circuit_t *circ)
     }
   }
 
+  if (circ->rend_data != NULL) {
+    char *rend_query_arg = NULL;
+
+    tor_asprintf(&rend_query_arg, "REND_QUERY=%s",
+                 circ->rend_data->onion_address);
+
+    smartlist_add(descparts, rend_query_arg);
+  }
+
   rv = smartlist_join_strings(descparts, " ", 0, NULL);
 
   SMARTLIST_FOREACH(descparts, char *, cp, tor_free(cp));