diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-04-18 11:13:36 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-04-18 11:13:36 -0400 |
| commit | 8362f8854aa3e36b766724226a3baec4d325c1c0 (patch) | |
| tree | d309eb1c3b9502b4323405f1a312f04dd868077c /src/or/router.h | |
| parent | cd1cdae0fac33bca359b34dae4062fe87a351661 (diff) | |
| parent | 4b15606fa2848f5112599865eb7b15ef2178e66a (diff) | |
| download | tor-8362f8854aa3e36b766724226a3baec4d325c1c0.tar.gz tor-8362f8854aa3e36b766724226a3baec4d325c1c0.zip | |
Merge branch 'less_charbuf_rebased' into maint-0.2.4
Conflicts:
src/or/dirserv.c
src/or/dirserv.h
src/test/test_dir.c
Diffstat (limited to 'src/or/router.h')
| -rw-r--r-- | src/or/router.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/router.h b/src/or/router.h index 96749b53c0..93ca22a933 100644 --- a/src/or/router.h +++ b/src/or/router.h @@ -90,8 +90,8 @@ int router_is_me(const routerinfo_t *router); int router_fingerprint_is_me(const char *fp); int router_pick_published_address(const 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_t *ident_key); +char *router_dump_router_to_string(routerinfo_t *router, + crypto_pk_t *ident_key); void router_get_prim_orport(const routerinfo_t *router, tor_addr_port_t *addr_port_out); void router_get_pref_orport(const routerinfo_t *router, |