diff options
| author | Nick Mathewson <nickm@torproject.org> | 2010-11-19 16:58:22 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2010-11-19 16:58:22 -0500 |
| commit | e361de80bbca479a68345a3e0db4243da00e5e38 (patch) | |
| tree | a9706abd77a41058d3ead33e06a4bf27c5bb56a1 /src/or/router.h | |
| parent | 21be4b5b4ca4412c958a80e65279e5f1babe8535 (diff) | |
| parent | a33b338c5bf5e40037f465c0257a70dedb095e82 (diff) | |
| download | tor-e361de80bbca479a68345a3e0db4243da00e5e38.tar.gz tor-e361de80bbca479a68345a3e0db4243da00e5e38.zip | |
Merge remote branch 'origin/maint-0.2.2'
Conflicts:
src/or/router.c
Diffstat (limited to 'src/or/router.h')
| -rw-r--r-- | src/or/router.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/router.h b/src/or/router.h index 41a9f7119c..f6a88d7637 100644 --- a/src/or/router.h +++ b/src/or/router.h @@ -77,7 +77,7 @@ int router_pick_published_address(or_options_t *options, uint32_t *addr); int router_rebuild_descriptor(int force); int router_dump_router_to_string(char *s, size_t maxlen, routerinfo_t *router, crypto_pk_env_t *ident_key); -int extrainfo_dump_to_string(char *s, size_t maxlen, extrainfo_t *extrainfo, +int extrainfo_dump_to_string(char **s, extrainfo_t *extrainfo, crypto_pk_env_t *ident_key); int is_legal_nickname(const char *s); int is_legal_nickname_or_hexdigest(const char *s); |