commit 85778dc92d652e4781812659590099ae9232e175 Merge: 3a364309a 380a95116 Author: Nick Mathewson nickm@torproject.org Date: Fri Nov 17 09:23:04 2017 -0500

Merge remote-tracking branch 'dgoulet/bug23861_032_01' into maint-0.3.2

changes/bug23861 | 5 +++++ src/or/directory.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)