diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-08-17 16:05:09 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-08-17 16:05:09 -0400 |
| commit | 1c64f99a1a74cac4074ddefa958fd4ae7acddcb2 (patch) | |
| tree | d47ca63f67fe817a7a87fe77f88976aa8908753b /src/or/router.c | |
| parent | 63dfc1d9b6e6d488f32c99c3ffad882f6fbe0f51 (diff) | |
| parent | e13e9c40c829d15fb71310b0638fff859b85580a (diff) | |
| download | tor-1c64f99a1a74cac4074ddefa958fd4ae7acddcb2.tar tor-1c64f99a1a74cac4074ddefa958fd4ae7acddcb2.tar.gz | |
Merge remote-tracking branch 'public/bug5124'
Diffstat (limited to 'src/or/router.c')
| -rw-r--r-- | src/or/router.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/or/router.c b/src/or/router.c index 1d45d5659..3b24caef2 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -2055,9 +2055,9 @@ router_dump_router_to_string(char *s, size_t maxlen, routerinfo_t *router, "router %s %s %d 0 %d\n" "%s" "platform %s\n" - "opt protocols Link 1 2 Circuit 1\n" + "protocols Link 1 2 Circuit 1\n" "published %s\n" - "opt fingerprint %s\n" + "fingerprint %s\n" "uptime %ld\n" "bandwidth %d %d %d\n" "%s%s%s%s" @@ -2076,15 +2076,15 @@ router_dump_router_to_string(char *s, size_t maxlen, routerinfo_t *router, (int) router->bandwidthrate, (int) router->bandwidthburst, (int) router->bandwidthcapacity, - has_extra_info_digest ? "opt extra-info-digest " : "", + has_extra_info_digest ? "extra-info-digest " : "", has_extra_info_digest ? extra_info_digest : "", has_extra_info_digest ? "\n" : "", - options->DownloadExtraInfo ? "opt caches-extra-info\n" : "", + options->DownloadExtraInfo ? "caches-extra-info\n" : "", onion_pkey, identity_pkey, family_line, - we_are_hibernating() ? "opt hibernating 1\n" : "", - options->HidServDirectoryV2 ? "opt hidden-service-dir\n" : "", - options->AllowSingleHopExits ? "opt allow-single-hop-exits\n" : ""); + we_are_hibernating() ? "hibernating 1\n" : "", + options->HidServDirectoryV2 ? "hidden-service-dir\n" : "", + options->AllowSingleHopExits ? "allow-single-hop-exits\n" : ""); tor_free(family_line); tor_free(onion_pkey); |