diff options
author | Nick Mathewson <nickm@torproject.org> | 2012-06-14 13:05:16 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2012-06-14 13:05:16 -0400 |
commit | 4fdce6b091181f01295270eedb23ef7735904635 (patch) | |
tree | b98709f3ea2749bc8aa0785e3df878d7eb360b51 /src/or/circuitbuild.h | |
parent | 7e57609a9fff3f5050c5f20050686c6eb470f31f (diff) | |
parent | aa212b173c340536eb94b4978174b068ead89cb1 (diff) | |
download | tor-4fdce6b091181f01295270eedb23ef7735904635.tar.gz tor-4fdce6b091181f01295270eedb23ef7735904635.zip |
Merge remote-tracking branch 'asn-mytor/bug5589_take2'
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 92811783d3..984d04a99e 100644 --- a/src/or/circuitbuild.h +++ b/src/or/circuitbuild.h @@ -167,7 +167,5 @@ int find_transport_by_bridge_addrport(const tor_addr_t *addr, uint16_t port, const transport_t **transport); transport_t *transport_get_by_name(const char *name); -int validate_pluggable_transports_config(void); - #endif |