commit 95cd7f6f67d4e57a5529382de088b52e222304ea Merge: 0262040 28de4d8 Author: Roger Dingledine <[email protected]> Date: Fri Feb 11 02:59:29 2011 -0500
Merge branch 'maint-0.2.1' into release-0.2.1
changes/bug1074-part2 | 6 ++++++
src/or/directory.c | 7 ++++---
2 files changed, 10 insertions(+), 3 deletions(-)
