commit a6ad26fd5fdfcad209d8263b4ea2a83b4a44c296 Merge: 5a1dfca07 cfc60e566 Author: Nick Mathewson nickm@torproject.org Date: Wed Oct 30 16:16:12 2019 -0400

Merge remote-tracking branch 'tor-github/pr/1485'

src/core/or/circuit_st.h | 5 +++++ src/core/or/circuitlist.c | 6 ++++++ src/core/or/circuitlist.h | 6 ++++++ 3 files changed, 17 insertions(+)