diff options
author | Nick Mathewson <nickm@torproject.org> | 2011-02-22 17:19:41 -0500 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2011-02-22 17:19:41 -0500 |
commit | 491abbc65e535b5308d6c57ab9ab3900ac2dd2d2 (patch) | |
tree | 63f1dc9a7f92bd931d14cd78aa37fd8ba3a59e81 /src/or/routerlist.c | |
parent | 7605985b3ff71cee7fabdf023baf298b218d04c1 (diff) | |
parent | 2392290c1887b732fd2309e57ce04ab71b9b4e69 (diff) | |
download | tor-491abbc65e535b5308d6c57ab9ab3900ac2dd2d2.tar.gz tor-491abbc65e535b5308d6c57ab9ab3900ac2dd2d2.zip |
Merge remote branch 'public/bug1859_021' into maint-0.2.1
Diffstat (limited to 'src/or/routerlist.c')
-rw-r--r-- | src/or/routerlist.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 7c8e36e402..fb8fb8815a 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -1989,9 +1989,6 @@ router_get_by_nickname(const char *nickname, int warn_if_unnamed) return router_get_by_hexdigest(nickname); if (!strcasecmp(nickname, UNNAMED_ROUTER_NICKNAME)) return NULL; - if (server_mode(get_options()) && - !strcasecmp(nickname, get_options()->Nickname)) - return router_get_my_routerinfo(); maybedigest = (strlen(nickname) >= HEX_DIGEST_LEN) && (base16_decode(digest,DIGEST_LEN,nickname,HEX_DIGEST_LEN) == 0); |