]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge remote-tracking branch 'origin/maint-0.2.5'
authorNick Mathewson <nickm@torproject.org>
Wed, 7 Jan 2015 12:50:14 +0000 (07:50 -0500)
committerNick Mathewson <nickm@torproject.org>
Wed, 7 Jan 2015 12:50:14 +0000 (07:50 -0500)
commit49dca8b1beae9c2dade2c3193fa7f77f5c15d869
tree03ea0117610094a95f9da28dc003566d7dee709c
parent7c5a45575fd7881dbb0c16895608775b44c87f01
parent2b9d48791d0b5245e3ccfd267150dfa34541c87c
Merge remote-tracking branch 'origin/maint-0.2.5'
src/or/dirserv.c