Merge branch 'maint-0.3.1' into maint-0.3.2

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

diff --cc src/or/circuitmux.h
Simple merge

diff --cc src/or/or.h
Simple merge

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

diff --cc src/or/relay.h
index 2412dcb23c234e678575f4174473e50517058434,9dc0b5d3a23feeff2e7977430d037b887dc838c7..4cc1a0fbdba70dcf6a661c04e9c8b65d4d317da9
--- 1/src/or/relay.h
--- 2/src/or/relay.h
+++ b/src/or/relay.h
@@@ -102,9 -109,10 +109,10 @@@ STATIC int connection_edge_process_reso
                                                   const relay_header_t *rh);
  STATIC packed_cell_t *packed_cell_new(void);
  STATIC packed_cell_t *cell_queue_pop(cell_queue_t *queue);
+ STATIC destroy_cell_t *destroy_cell_queue_pop(destroy_cell_queue_t *queue);
  STATIC size_t cell_queues_get_total_allocation(void);
  STATIC int cell_queues_check_size(void);
 -#endif
 +#endif /* defined(RELAY_PRIVATE) */
  
 -#endif
 +#endif /* !defined(TOR_RELAY_H) */
  

diff --cc src/test/test_circuitmux.c
Simple merge