commit 7d1e47559a391be46cd137e0580ee91b5026a94a Merge: 349a92bf3 6dc784bdb Author: Nick Mathewson nickm@torproject.org Date: Tue Nov 14 14:45:11 2017 -0500
Merge branch 'maint-0.3.2' into release-0.3.2
changes/bug24230 | 4 ++++ src/or/control.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-)