aboutsummaryrefslogtreecommitdiff
path: root/src/test
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2016-11-21 12:40:08 -0500
committerNick Mathewson <nickm@torproject.org>2016-11-21 12:40:08 -0500
commite2c881487cab57b1b4301560f10b4e3ff4a44167 (patch)
treebedc9cf5ab88724b689a174fa0aeb15642112db3 /src/test
parent8a767ba7fbeedb3d8838ccfe57583203b783241d (diff)
parentf12aad7f09a608a803b74315213f6f57c97737de (diff)
downloadtor-e2c881487cab57b1b4301560f10b4e3ff4a44167.tar.gz
tor-e2c881487cab57b1b4301560f10b4e3ff4a44167.zip
Merge remote-tracking branch 'arma/bug20423' into maint-0.2.9
Diffstat (limited to 'src/test')
-rw-r--r--src/test/test_config.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/test/test_config.c b/src/test/test_config.c
index 384bff410f..2fc37b0bb8 100644
--- a/src/test/test_config.c
+++ b/src/test/test_config.c
@@ -3480,10 +3480,12 @@ test_config_default_dir_servers(void *arg)
static int mock_router_pick_published_address_result = 0;
static int
-mock_router_pick_published_address(const or_options_t *options, uint32_t *addr)
+mock_router_pick_published_address(const or_options_t *options,
+ uint32_t *addr, int cache_only)
{
(void)options;
(void)addr;
+ (void)cache_only;
return mock_router_pick_published_address_result;
}