]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge remote-tracking branch 'origin/maint-0.2.4'
authorNick Mathewson <nickm@torproject.org>
Sun, 10 Nov 2013 17:24:12 +0000 (12:24 -0500)
committerNick Mathewson <nickm@torproject.org>
Sun, 10 Nov 2013 17:24:12 +0000 (12:24 -0500)
commitfc5a881bd3bd635be897fafdd4f9a30d5b2bed14
tree257131c7db975442223002903a4fde97f6c762d6
parente30fb0a160c083ceaf1bf215089ab5e1b0924f34
parent8bfa596c152603e376b8f096a3367c1d785d6763
Merge remote-tracking branch 'origin/maint-0.2.4'
doc/tor.1.txt
src/or/config.c
src/or/router.c