commit ad3f0953e6da8bf95f2dd754b91705d4c7d80a1e Merge: eebfe4f53 7a83cf75d Author: Nick Mathewson nickm@torproject.org Date: Fri Sep 8 08:24:47 2017 -0400
Merge branch 'maint-0.3.1'
changes/bug22644 | 5 +++++ src/or/control.c | 16 ++++++++++++---- 2 files changed, 17 insertions(+), 4 deletions(-)