diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-06-14 12:25:33 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-06-14 12:25:33 -0400 |
| commit | 8839b86085dbb9ccf26165b6eae4d09462bc88b6 (patch) | |
| tree | 4572f6b0c38136b3d631c8878b7108213627960e /src/or/routerparse.c | |
| parent | 910dadd6eab5b2b3af3b655f52b861085f379b84 (diff) | |
| parent | 54d7d31cba84232b50fef4287951b2c4bfa746c2 (diff) | |
| download | tor-8839b86085dbb9ccf26165b6eae4d09462bc88b6.tar.gz tor-8839b86085dbb9ccf26165b6eae4d09462bc88b6.zip | |
Merge remote-tracking branch 'origin/maint-0.2.2'
Diffstat (limited to 'src/or/routerparse.c')
| -rw-r--r-- | src/or/routerparse.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/or/routerparse.c b/src/or/routerparse.c index b146e5e3c9..67b238e747 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -1534,10 +1534,10 @@ router_parse_entry_from_string(const char *s, const char *end, } } - if ((tok = find_opt_by_keyword(tokens, K_CACHES_EXTRA_INFO))) + if (find_opt_by_keyword(tokens, K_CACHES_EXTRA_INFO)) router->caches_extra_info = 1; - if ((tok = find_opt_by_keyword(tokens, K_ALLOW_SINGLE_HOP_EXITS))) + if (find_opt_by_keyword(tokens, K_ALLOW_SINGLE_HOP_EXITS)) router->allow_single_hop_exits = 1; if ((tok = find_opt_by_keyword(tokens, K_EXTRA_INFO_DIGEST))) { @@ -1550,7 +1550,7 @@ router_parse_entry_from_string(const char *s, const char *end, } } - if ((tok = find_opt_by_keyword(tokens, K_HIDDEN_SERVICE_DIR))) { + if (find_opt_by_keyword(tokens, K_HIDDEN_SERVICE_DIR)) { router->wants_to_be_hs_dir = 1; } |