diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-03-05 12:44:40 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-03-05 12:44:40 -0500 |
| commit | f0b2dc83b60b0de1644ce9fb5e19fef516e9ffde (patch) | |
| tree | ee8e9b36590f7cb2f349aa25eeb1abd33e20a7b1 /src/or/routerparse.c | |
| parent | 12954908623a285606ec7522168cd2ac7e799525 (diff) | |
| parent | 74e6a47a808803c985f55b626dff294dbe425043 (diff) | |
| download | tor-f0b2dc83b60b0de1644ce9fb5e19fef516e9ffde.tar.gz tor-f0b2dc83b60b0de1644ce9fb5e19fef516e9ffde.zip | |
Merge remote-tracking branch 'arma/ticket5528'
Conflicts:
src/or/router.c
src/test/test_dir.c
Diffstat (limited to 'src/or/routerparse.c')
| -rw-r--r-- | src/or/routerparse.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/or/routerparse.c b/src/or/routerparse.c index 9414a533b9..ad3cf3b388 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -1195,8 +1195,7 @@ router_parse_entry_from_string(const char *s, const char *end, log_warn(LD_DIR,"Router nickname is invalid"); goto err; } - router->address = tor_strdup(tok->args[1]); - if (!tor_inet_aton(router->address, &in)) { + if (!tor_inet_aton(tok->args[1], &in)) { log_warn(LD_DIR,"Router address is not an IP address."); goto err; } |