summaryrefslogtreecommitdiff
path: root/src/or/main.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2016-11-03 15:44:46 -0400
committerNick Mathewson <nickm@torproject.org>2016-11-03 15:44:46 -0400
commit3cd520a52d50b9e901d33d0164d847d12a278f1b (patch)
tree7ba6f48f7245871f2572a4f209b23f0c284bf626 /src/or/main.h
parent3bb49c011006d042f8a3f802d7abb3e9da51b15b (diff)
parent7a45ef5a4706aab57abcf170c10080811223175e (diff)
downloadtor-3cd520a52d50b9e901d33d0164d847d12a278f1b.tar.gz
tor-3cd520a52d50b9e901d33d0164d847d12a278f1b.zip
Merge branch 'maint-0.2.8' into maint-0.2.9
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 0220ae3c57..07b22598b1 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);
MOCK_DECL(int, connection_count_moribund, (void));