aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--changes/addrmap_error5
-rw-r--r--src/or/control.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/changes/addrmap_error b/changes/addrmap_error
new file mode 100644
index 0000000000..17d9b54232
--- /dev/null
+++ b/changes/addrmap_error
@@ -0,0 +1,5 @@
+ o Minor bugfixes (controller):
+ - The ADDRMAP command can no longer generate an ill-formed error
+ code on a failed MAPADDRESS. It now says "internal" rather than
+ an English sentence fragment with spaces in the middle. Bugfix on
+ Tor 0.2.0.19-alpha.
diff --git a/src/or/control.c b/src/or/control.c
index c6a66ae5f5..0b7f04adac 100644
--- a/src/or/control.c
+++ b/src/or/control.c
@@ -2943,7 +2943,7 @@ handle_control_resolve(control_connection_t *conn, uint32_t len,
send_control_done(conn);
SMARTLIST_FOREACH(failed, const char *, arg, {
control_event_address_mapped(arg, arg, time(NULL),
- "Unable to launch resolve request");
+ "internal");
});
SMARTLIST_FOREACH(args, char *, cp, tor_free(cp));