diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-06-02 13:05:00 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-06-02 13:05:00 -0400 |
| commit | 6a320b99058ff19a2b71425e7cd6f267798411be (patch) | |
| tree | bef9e37cd3f291c8cb873acf6b96294266c8c7c3 /src/or/circuitbuild.h | |
| parent | 0a4a3de3def27a7c7f8a514546b33662d0cfe6c5 (diff) | |
| parent | 385c59798af80e2609b66afb2998acb508060f95 (diff) | |
| download | tor-6a320b99058ff19a2b71425e7cd6f267798411be.tar.gz tor-6a320b99058ff19a2b71425e7cd6f267798411be.zip | |
Merge remote-tracking branch 'origin/maint-0.2.2'
This merge was a bit nontrivial, since I had to write a new
node_is_a_configured_bridge to parallel router_is_a_configured_bridge.
Conflicts:
src/or/circuitbuild.c
Diffstat (limited to 'src/or/circuitbuild.h')
| -rw-r--r-- | src/or/circuitbuild.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/or/circuitbuild.h b/src/or/circuitbuild.h index 87adb9a1e8..b1eb5a6cad 100644 --- a/src/or/circuitbuild.h +++ b/src/or/circuitbuild.h @@ -66,6 +66,7 @@ int getinfo_helper_entry_guards(control_connection_t *conn, void mark_bridge_list(void); void sweep_bridge_list(void); int routerinfo_is_a_configured_bridge(const routerinfo_t *ri); +int node_is_a_configured_bridge(const node_t *node); void learned_router_identity(const tor_addr_t *addr, uint16_t port, const char *digest); void bridge_add_from_config(const tor_addr_t *addr, uint16_t port, |