summaryrefslogtreecommitdiff
path: root/src/or/main.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2015-04-16 11:15:29 -0400
committerNick Mathewson <nickm@torproject.org>2015-04-16 11:15:29 -0400
commitf152081de174fbd0e097e97d7d76d6b401dcd194 (patch)
tree37b745d3204709db1fafd4f7baf1a5e6de427260 /src/or/main.h
parentcc10f13408e25eaf04f849d0f761680f383fa61d (diff)
parent56061976dbe148dc615c8072c962ddfc0d719585 (diff)
downloadtor-f152081de174fbd0e097e97d7d76d6b401dcd194.tar.gz
tor-f152081de174fbd0e097e97d7d76d6b401dcd194.zip
Merge remote-tracking branch 'arma/ticket8766'
Diffstat (limited to 'src/or/main.h')
-rw-r--r--src/or/main.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/or/main.h b/src/or/main.h
index f77b4711c5..542eab6565 100644
--- a/src/or/main.h
+++ b/src/or/main.h
@@ -52,6 +52,7 @@ void directory_info_has_arrived(time_t now, int from_cache);
void ip_address_changed(int at_interface);
void dns_servers_relaunch_checks(void);
+void reset_all_main_loop_timers(void);
void reschedule_descriptor_update_check(void);
MOCK_DECL(long,get_uptime,(void));