From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 3 Nov 2016 19:44:46 +0000 (-0400)
Subject: Merge branch 'maint-0.2.8' into maint-0.2.9
X-Git-Tag: tor-0.2.9.5-alpha~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3cd520a52d50b9e901d33d0164d847d12a278f1b;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.8' into maint-0.2.9
---

3cd520a52d50b9e901d33d0164d847d12a278f1b
diff --cc src/or/main.h
index 0220ae3c57,6949376f3e..07b22598b1
--- a/src/or/main.h
+++ b/src/or/main.h
@@@ -45,10 -45,10 +45,12 @@@ int connection_is_writing(connection_t 
  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));
 +
  void directory_all_unreachable(time_t now);
  void directory_info_has_arrived(time_t now, int from_cache, int suppress_logs);