diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-05-30 15:41:46 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-05-30 15:41:46 -0400 |
| commit | fa1d47293b62fd378a7e43cf3ce3e7bb3be884e3 (patch) | |
| tree | b80ab67323274c8ae1e2f8097278e923c5d5d243 /src/or/routerlist.h | |
| parent | 21de9d46e264ceb14f3fe59d17210d82f2499637 (diff) | |
| parent | 7f0fb8e6083128ff20b30d8cd29c220e9427d95e (diff) | |
| download | tor-fa1d47293b62fd378a7e43cf3ce3e7bb3be884e3.tar.gz tor-fa1d47293b62fd378a7e43cf3ce3e7bb3be884e3.zip | |
Merge remote-tracking branch 'origin/maint-0.2.2'
The conflicts were mainly caused by the routerinfo->node transition.
Conflicts:
src/or/circuitbuild.c
src/or/command.c
src/or/connection_edge.c
src/or/directory.c
src/or/dirserv.c
src/or/relay.c
src/or/rendservice.c
src/or/routerlist.c
Diffstat (limited to 'src/or/routerlist.h')
| -rw-r--r-- | src/or/routerlist.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/or/routerlist.h b/src/or/routerlist.h index a613c34b88..3a8af6fd9d 100644 --- a/src/or/routerlist.h +++ b/src/or/routerlist.h @@ -56,6 +56,7 @@ const node_t *router_choose_random_node(smartlist_t *excludedsmartlist, const routerinfo_t *router_get_by_nickname(const char *nickname, int warn_if_unnamed); +int router_is_named(const routerinfo_t *router); int router_digest_is_trusted_dir_type(const char *digest, dirinfo_type_t type); #define router_digest_is_trusted_dir(d) \ |