From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 21 Dec 2017 15:50:33 +0000 (-0500)
Subject: Merge branch 'maint-0.3.1' into maint-0.3.2
X-Git-Tag: tor-0.3.2.8-rc~4^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=84adb9fcca3d4e1954c1dd215a3e765c689d82b3;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.1' into maint-0.3.2
---

84adb9fcca3d4e1954c1dd215a3e765c689d82b3
diff --cc src/or/relay.h
index 2412dcb23c,9dc0b5d3a2..4cc1a0fbdb
--- 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) */