commit bcde4cc4cf521c8e125e95cdd793aa499d1a36c7 Merge: 0e3cf3e 795c0f7 Author: Nick Mathewson <nickm@torproject.org> Date: Wed Oct 9 12:36:24 2013 -0400 Merge remote-tracking branch 'karsten/task-9854-2' src/config/torrc.sample.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)