aboutsummaryrefslogtreecommitdiff
path: root/src/or/main.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2016-11-03 15:44:30 -0400
committerNick Mathewson <nickm@torproject.org>2016-11-03 15:44:30 -0400
commit7a45ef5a4706aab57abcf170c10080811223175e (patch)
tree34c52858831c7defb03fa52a3427d044de40c94c /src/or/main.h
parent9b18b215bb34c4df1b94dec218c68a532c341e26 (diff)
parentb2f82d45b7e0166a8de3a7b6d38e288dd1e6d96e (diff)
downloadtor-7a45ef5a4706aab57abcf170c10080811223175e.tar.gz
tor-7a45ef5a4706aab57abcf170c10080811223175e.zip
Merge remote-tracking branch 'arma/bug19969_028_squashed' into maint-0.2.8
Diffstat (limited to 'src/or/main.h')
-rw-r--r--src/or/main.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/or/main.h b/src/or/main.h
index ad865b8124..6949376f3e 100644
--- a/src/or/main.h
+++ b/src/or/main.h
@@ -45,6 +45,8 @@ int connection_is_writing(connection_t *conn);
MOCK_DECL(void,connection_stop_writing,(connection_t *conn));
MOCK_DECL(void,connection_start_writing,(connection_t *conn));
+void tell_event_loop_to_finish(void);
+
void connection_stop_reading_from_linked_conn(connection_t *conn);
void directory_all_unreachable(time_t now);