commit ee75c02691888a0cb7ee34e4f18436c523f92f0d Merge: 69c47ab ae0f858 Author: Nick Mathewson <nickm@torproject.org> Date: Wed Feb 10 15:42:11 2016 -0500 Merge remote-tracking branch 'andrea/bug18116' changes/bug18116 | 3 +++ src/or/circuitlist.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+)