]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge branch 'maint-0.2.4' into maint-0.2.5
authorRoger Dingledine <arma@torproject.org>
Thu, 24 Jul 2014 20:23:08 +0000 (16:23 -0400)
committerRoger Dingledine <arma@torproject.org>
Thu, 24 Jul 2014 20:23:08 +0000 (16:23 -0400)
commita4c641cce91acb673f81db2b6093fde425039eaf
tree80ab630220e7565788719f359b495f5f70246713
parent5c200d9be28ac9e53caac333ddd334539524d9e1
parent71c62b15ca809105cbba0bf2fa86484793701b64
Merge branch 'maint-0.2.4' into maint-0.2.5
doc/tor.1.txt
src/or/config.c
src/or/entrynodes.c