]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge branch 'maint-0.2.5'
authorRoger Dingledine <arma@torproject.org>
Thu, 24 Jul 2014 20:23:26 +0000 (16:23 -0400)
committerRoger Dingledine <arma@torproject.org>
Thu, 24 Jul 2014 20:23:26 +0000 (16:23 -0400)
commitbc9866e13ff140b237b0560a784bb72bff67a8e3
tree962abd71251435b1174b8a33ab7fe532fffe9fa0
parentdfe80c966d5136bc4f3287f4f762384ecc4df0c5
parenta4c641cce91acb673f81db2b6093fde425039eaf
Merge branch 'maint-0.2.5'
doc/tor.1.txt
src/or/config.c
src/or/entrynodes.c