commit 3cace828a9b42c62a73d1e3b79161a7f68aca40e Merge: 08592c95f 12dad5ebf Author: Nick Mathewson nickm@torproject.org Date: Fri Sep 8 08:24:36 2017 -0400

Merge branch 'bug22644_029' into maint-0.2.9

changes/bug22644 | 5 +++++ src/or/control.c | 16 ++++++++++++---- 2 files changed, 17 insertions(+), 4 deletions(-)