[tor-commits] [tor/maint-0.2.9] Merge branch 'maint-0.2.8' into maint-0.2.9

nickm at torproject.org nickm at torproject.org
Thu Nov 3 19:45:23 UTC 2016


commit 3cd520a52d50b9e901d33d0164d847d12a278f1b
Merge: 3bb49c0 7a45ef5
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Nov 3 15:44:46 2016 -0400

    Merge branch 'maint-0.2.8' into maint-0.2.9

 changes/bug19969         | 10 ++++++++++
 src/or/connection_edge.c |  9 +++++++++
 src/or/main.c            | 31 +++++++++++++++++++++++--------
 src/or/main.h            |  2 ++
 4 files changed, 44 insertions(+), 8 deletions(-)

diff --cc src/or/main.h
index 0220ae3,6949376..07b2259
--- 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);
  



More information about the tor-commits mailing list