commit 8d74fba651dfb788568d2236da773ed9fd9b4a39 Merge: dca3c9f 3085b76 Author: Nick Mathewson <nickm@torproject.org> Date: Tue Jan 10 15:00:02 2012 -0500 Merge branch 'absolute_cookie_file' changes/absolute_cookie_file | 3 +++ src/or/control.c | 6 +++++- 2 files changed, 8 insertions(+), 1 deletions(-)