Merge branch 'maint-0.2.2'
commit1c5b19a31a4bbf52747cfc9c6be59a1ad9af6843
authorRoger Dingledine <arma@torproject.org>
Fri, 11 Feb 2011 06:21:04 +0000 (11 01:21 -0500)
committerRoger Dingledine <arma@torproject.org>
Fri, 11 Feb 2011 06:21:04 +0000 (11 01:21 -0500)
tree6fd101fb4973731ab4a6cb442585090206633eb3
parentc79a24f50521383221fcc9ec5c5871fb4d547383
parent9b745cdbf9cd7384e44e18bf40a3d2c9becbc345
Merge branch 'maint-0.2.2'
src/or/directory.c