diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-08-15 10:54:55 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-08-15 10:54:55 -0400 |
| commit | aeb27526f81297ed265f93ee82a0ed2eabbd451e (patch) | |
| tree | 654113f067226bc2f80818c69b7cdd2116296e31 | |
| parent | 0ddc8de0b60ecbda3e7bf1df3afc4ef28275dc7a (diff) | |
| parent | 03f6ee8c5f270497b4990b98bc3d23ffea6c75a9 (diff) | |
| download | tor-aeb27526f81297ed265f93ee82a0ed2eabbd451e.tar.gz tor-aeb27526f81297ed265f93ee82a0ed2eabbd451e.zip | |
Merge remote-tracking branch 'origin/maint-0.2.2'
| -rw-r--r-- | changes/bug3732 | 7 | ||||
| -rw-r--r-- | src/or/control.c | 2 |
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 ff961948cb..853f4c4e45 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -3569,7 +3569,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); } |