aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Ransom <rransom.8774@gmail.com>2011-08-15 04:53:11 -0700
committerNick Mathewson <nickm@torproject.org>2011-08-15 10:54:19 -0400
commit03f6ee8c5f270497b4990b98bc3d23ffea6c75a9 (patch)
tree5208dcd383d008281e8f3dce69d7b64d394c0da6
parent92bea30e28f62ea4c5d335420e2a328ff64598bc (diff)
downloadtor-03f6ee8c5f270497b4990b98bc3d23ffea6c75a9.tar.gz
tor-03f6ee8c5f270497b4990b98bc3d23ffea6c75a9.zip
Remove extra quotation marks around the result of esc_for_log
-rw-r--r--changes/bug37327
-rw-r--r--src/or/control.c2
2 files changed, 8 insertions, 1 deletions
diff --git a/changes/bug3732 b/changes/bug3732
new file mode 100644
index 0000000000..7a71d1aef3
--- /dev/null
+++ b/changes/bug3732
@@ -0,0 +1,7 @@
+ o Major bugfixes:
+
+ - Remove an extra pair of quotation marks around the error
+ message in control-port STATUS_GENERAL BUG events. Bugfix on
+ 0.1.2.6-alpha; fixes bug 3732.
+
+
diff --git a/src/or/control.c b/src/or/control.c
index 954da65143..de9dca0be9 100644
--- a/src/or/control.c
+++ b/src/or/control.c
@@ -3480,7 +3480,7 @@ control_event_logmsg(int severity, uint32_t domain, const char *msg)
severity <= LOG_NOTICE) {
char *esc = esc_for_log(msg);
++disable_log_messages;
- control_event_general_status(severity, "BUG REASON=\"%s\"", esc);
+ control_event_general_status(severity, "BUG REASON=%s", esc);
--disable_log_messages;
tor_free(esc);
}