diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-11-27 22:39:46 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-11-27 22:39:46 -0500 |
| commit | a28df3fb6713043e801fb5fcf5019fc0539b5066 (patch) | |
| tree | c67fce712d60ac0ff073b0c59bb4b06e7dae04b4 /src/or/config.h | |
| parent | 3d2366c676233c30133928940b4bc19d8f25f193 (diff) | |
| parent | 12b6c7df4aaf3224bc5649ef69a06dccc58ae961 (diff) | |
| download | tor-a28df3fb6713043e801fb5fcf5019fc0539b5066.tar.gz tor-a28df3fb6713043e801fb5fcf5019fc0539b5066.zip | |
Merge remote-tracking branch 'andrea/cmux_refactor_configurable_threshold'
Conflicts:
src/or/or.h
src/test/Makefile.nmake
Diffstat (limited to 'src/or/config.h')
| -rw-r--r-- | src/or/config.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/config.h b/src/or/config.h index 6cc81ab948..133b472eb2 100644 --- a/src/or/config.h +++ b/src/or/config.h @@ -33,7 +33,7 @@ void reset_last_resolved_addr(void); int resolve_my_address(int warn_severity, const or_options_t *options, uint32_t *addr_out, const char **method_out, char **hostname_out); -int is_local_addr(const tor_addr_t *addr); +MOCK_DECL(int, is_local_addr, (const tor_addr_t *addr)); void options_init(or_options_t *options); #define OPTIONS_DUMP_MINIMAL 1 |