torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'arma/bug20423' into maint-0.2.9

Browse Source
This commit is contained in:
Nick Mathewson
2016-11-21 12:40:08 -05:00
parent 8a767ba7fb f12aad7f09
commit e2c881487c
7 changed files with 40 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/test_config.c
+3 -1
View File
@@ -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;
}