commit b645e2f2b0113b143078a4fb6c227280b17fcb00 Merge: 928380e 6852868 Author: Nick Mathewson <nickm@torproject.org> Date: Sat Feb 6 15:08:49 2016 -0500 Merge remote-tracking branch 'alec/dead_code_removal' src/or/main.c | 38 -------------------------------------- 1 file changed, 38 deletions(-)