[tor-commits] [tor/master] Merge remote-tracking branch 'karsten/task-9854-2'

nickm at torproject.org nickm at torproject.org
Wed Oct 9 16:36:29 UTC 2013


commit bcde4cc4cf521c8e125e95cdd793aa499d1a36c7
Merge: 0e3cf3e 795c0f7
Author: Nick Mathewson <nickm at 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(-)



More information about the tor-commits mailing list