commit 3401c34151a29fe962944ce3ea77f14056c87efa Merge: a034863 6d66432 Author: Nick Mathewson <nickm@torproject.org> Date: Tue Jan 6 14:28:02 2015 -0500 Merge remote-tracking branch 'public/bug14116_025' changes/bug14116_025 | 3 +++ src/or/control.c | 8 ++++++++ 2 files changed, 11 insertions(+)