commit 35558c39dd162902a0e007b6e9dbd66d979043fd
Merge: c9906cc3f 8b2e72106
Author: Nick Mathewson
Date: Fri Nov 16 08:57:56 2018 -0500
Merge remote-tracking branch 'dgoulet/ticket27471_035_02' into maint-0.3.5
changes/ticket27471| 5 ++
src/core/or/circuitlist.c | 49
commit 62401812c71856c6884c32a57d1edd16576643f1
Merge: 0a41d17c1 8b2e72106
Author: Nick Mathewson
Date: Thu Oct 18 13:01:41 2018 -0400
Merge remote-tracking branch 'dgoulet/ticket27471_035_02'
changes/ticket27471| 5 ++
src/core/or/circuitlist.c | 49