Merge branch 'maint-0.2.8' into maint-0.2.9

diff --cc src/or/connection_edge.c
Simple merge

diff --cc src/or/main.c
Simple merge

diff --cc src/or/main.h
index 0220ae3c5719a6b96d8996d247d8c686d025037a,6949376f3e7aef50bbd2747f10f304575e282294..07b22598b1ec764c625e920392653346e4c7aa20
--- 1/src/or/main.h
--- 2/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);