[tor-commits] [tor/master] Wrong format in log statement

[nickm at torproject.org]

commit 151f5f90b8a103a35dfbf62426257dc918df4816
Author: David Goulet <dgoulet at ev0ke.net>
Date:   Fri Nov 7 11:40:41 2014 -0500

    Wrong format in log statement
    
    Fixes bug 13701.
---
 changes/bug13701    |    4 ++++
 src/or/circuituse.c |    2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/changes/bug13701 b/changes/bug13701
new file mode 100644
index 0000000..23a08af
--- /dev/null
+++ b/changes/bug13701
@@ -0,0 +1,4 @@
+  o Minor bugfixes (logging):
+    - Log the circuit identifier correctly in
+      connection_ap_handshake_attach_circuit().  Fixes bug 13701;
+      bugfix on 0.0.6.
diff --git a/src/or/circuituse.c b/src/or/circuituse.c
index 441a8fc..10bc45f 100644
--- a/src/or/circuituse.c
+++ b/src/or/circuituse.c
@@ -2324,7 +2324,7 @@ connection_ap_handshake_attach_circuit(entry_connection_t *conn)
       tor_assert(rendcirc);
       /* one is already established, attach */
       log_info(LD_REND,
-               "rend joined circ %d already here. attaching. "
+               "rend joined circ %u already here. attaching. "
                "(stream %d sec old)",
                (unsigned)rendcirc->base_.n_circ_id, conn_age);
       /* Mark rendezvous circuits as 'newly dirty' every time you use