commit 15179a3e01eac0580703647ffcfe35cd2b9a5dce Merge: c24b90e3a c928fb988 Author: Nick Mathewson nickm@torproject.org Date: Mon Nov 13 11:13:22 2017 -0500
Merge branch 'maint-0.2.9' into release-0.2.9
changes/ticket21953 | 6 ++++++ src/or/main.c | 10 +++++++++- 2 files changed, 15 insertions(+), 1 deletion(-)