diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-11-04 09:49:35 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-11-04 09:52:04 -0500 |
| commit | 9619c395ac7e2a8c2e57f55cd1885fe5f8e5f8b5 (patch) | |
| tree | 5741dcdf0bf425712470554a0dfb63cd54f4a2a1 /src/or/entrynodes.c | |
| parent | b1ca05d273eaef7477528c059ab0d1deb0dc9dab (diff) | |
| parent | 2d4241d58482c919984f163323efb96c6f365a2d (diff) | |
| download | tor-9619c395ac7e2a8c2e57f55cd1885fe5f8e5f8b5.tar.gz tor-9619c395ac7e2a8c2e57f55cd1885fe5f8e5f8b5.zip | |
Merge remote-tracking branch 'andrea/ticket6456'
Somewhat tricky conflicts:
src/or/config.c
Also, s/test_assert/tt_assert in test_config.c
Diffstat (limited to 'src/or/entrynodes.c')
| -rw-r--r-- | src/or/entrynodes.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c index 5bd0268dfd..b18aabe1f4 100644 --- a/src/or/entrynodes.c +++ b/src/or/entrynodes.c @@ -1919,8 +1919,8 @@ bridge_resolve_conflicts(const tor_addr_t *addr, uint16_t port, /** Return True if we have a bridge that uses a transport with name * <b>transport_name</b>. */ -int -transport_is_needed(const char *transport_name) +MOCK_IMPL(int, +transport_is_needed, (const char *transport_name)) { if (!bridge_list) return 0; |