commit 2db858ef610ef28875631ee738ec4b3d6fcdca11 Merge: 6c2b48d 58172be Author: Nick Mathewson <nickm@torproject.org> Date: Wed Jan 11 09:28:54 2017 -0500 Merge remote-tracking branch 'jryans/dependant-corrected' changes/18146 | 5 +++++ src/or/config.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)