diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-09-07 10:51:38 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-09-07 10:51:38 -0400 |
| commit | 3fe2161d28f27e2f036991eb4d4b035a064d36b5 (patch) | |
| tree | b45bf0e39d9871738f48c35854a87b3912eb2c00 /src/or/circuitbuild.h | |
| parent | 78a3de14434f6c714675f2d9175bb64d392030c1 (diff) | |
| parent | 14f4a5da45b5c3f9fb616d49b75d0ed1f7db78c6 (diff) | |
| download | tor-3fe2161d28f27e2f036991eb4d4b035a064d36b5.tar.gz tor-3fe2161d28f27e2f036991eb4d4b035a064d36b5.zip | |
Merge remote-tracking branch 'asn/bug6788'
Diffstat (limited to 'src/or/circuitbuild.h')
| -rw-r--r-- | src/or/circuitbuild.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/or/circuitbuild.h b/src/or/circuitbuild.h index bc775c3775..c3905ca21a 100644 --- a/src/or/circuitbuild.h +++ b/src/or/circuitbuild.h @@ -137,8 +137,6 @@ const char *find_transport_name_by_bridge_addrport(const tor_addr_t *addr, struct transport_t; int find_transport_by_bridge_addrport(const tor_addr_t *addr, uint16_t port, const struct transport_t **transport); -const char *find_transport_name_by_bridge_addrport(const tor_addr_t *addr, - uint16_t port); int validate_pluggable_transports_config(void); |