diff options
author | Nick Mathewson <nickm@torproject.org> | 2016-08-29 15:02:11 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2016-08-29 15:02:11 -0400 |
commit | bbaa7d09a045130560a2f5da579671c5e02c9cd7 (patch) | |
tree | 232540453f40eb00b2dc0492b236967f383627e8 /src/or/rendservice.c | |
parent | f46ce6e3d8bea3cf00388c87c29cdcafd4bab350 (diff) | |
parent | 19816f2f782568722964d35ee132af441a809db3 (diff) | |
download | tor-bbaa7d09a045130560a2f5da579671c5e02c9cd7.tar.gz tor-bbaa7d09a045130560a2f5da579671c5e02c9cd7.zip |
Merge remote-tracking branch 'teor/reject-tap-v6'
Diffstat (limited to 'src/or/rendservice.c')
-rw-r--r-- | src/or/rendservice.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 4c88f1fa5f..4ad35059f1 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -3896,3 +3896,11 @@ rend_service_set_connection_addr_port(edge_connection_t *conn, return -2; } +/* Stub that should be replaced with the #17178 version of the function + * when merging. */ +int +rend_service_allow_direct_connection(const or_options_t *options) +{ + (void)options; + return 0; +} |