commit 6f87a85897ca82fac9fc132e0f0cf41eacab20d4 Merge: 91c17ffbd f7222e6d8 Author: Nick Mathewson nickm@torproject.org Date: Mon Oct 23 08:53:14 2017 -0400

Merge remote-tracking branch 'public/bug23690_028' into maint-0.2.8

changes/bug23690 | 5 +++++ src/or/circuitlist.c | 1 + 2 files changed, 6 insertions(+)