[tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2

[nickm at torproject.org]

commit 84adb9fcca3d4e1954c1dd215a3e765c689d82b3
Merge: c38157be9 08469a338
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Dec 21 10:50:33 2017 -0500

    Merge branch 'maint-0.3.1' into maint-0.3.2

 changes/bug24666           |  7 ++++
 src/or/circuitmux.c        | 34 ++++++--------------
 src/or/circuitmux.h        |  2 +-
 src/or/or.h                | 15 +++++++++
 src/or/relay.c             | 79 ++++++++++++++++++++++++++++++++++++++++++++--
 src/or/relay.h             |  8 +++++
 src/test/test_circuitmux.c | 12 +++----
 7 files changed, 123 insertions(+), 34 deletions(-)

diff --cc src/or/relay.h
index 2412dcb23,9dc0b5d3a..4cc1a0fbd
--- a/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) */