diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-11-12 13:12:14 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-11-12 13:12:14 -0500 |
| commit | 81433e74322bb6cab67458ff7ba524ee86ad7e1c (patch) | |
| tree | bcf1f4eb6cd71af800f63cdcef311034a78c0e4e /src/or/routerlist.c | |
| parent | ccc54d545ec15205d3ed3a92ad4c783adbdc97d1 (diff) | |
| parent | 032560fc750811ba361143d99cb61ab4abb26b36 (diff) | |
| download | tor-81433e74322bb6cab67458ff7ba524ee86ad7e1c.tar.gz tor-81433e74322bb6cab67458ff7ba524ee86ad7e1c.zip | |
Merge remote-tracking branch 'rl1987/bug13644'
Diffstat (limited to 'src/or/routerlist.c')
| -rw-r--r-- | src/or/routerlist.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/routerlist.c b/src/or/routerlist.c index fb39b6ea64..0ebdac6851 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -3382,7 +3382,7 @@ router_add_to_routerlist(routerinfo_t *router, const char **msg, router_describe(router)); *msg = "Router descriptor was not new."; routerinfo_free(router); - return ROUTER_WAS_NOT_NEW; + return ROUTER_IS_ALREADY_KNOWN; } } @@ -3467,7 +3467,7 @@ router_add_to_routerlist(routerinfo_t *router, const char **msg, &routerlist->desc_store); routerlist_insert_old(routerlist, router); *msg = "Router descriptor was not new."; - return ROUTER_WAS_NOT_NEW; + return ROUTER_IS_ALREADY_KNOWN; } else { /* Same key, and either new, or listed in the consensus. */ log_debug(LD_DIR, "Replacing entry for router %s", |