commit 8585cc57f8fc2233ff27a66509320ec0ab34d563 Merge: 54d9632 2cbaf39 Author: Nick Mathewson <nickm@torproject.org> Date: Thu Dec 17 14:57:16 2015 -0500 Merge branch 'maint-0.2.7' changes/bug17675 | 4 ++++ src/or/main.c | 3 +++ 2 files changed, 7 insertions(+)