commit 4f730e4f3f39748e214470357e3d7aff407fe7e0 Merge: cdc59c1 0ab62a4 Author: Roger Dingledine arma@torproject.org Date: Tue Feb 22 14:44:09 2011 -0500

Merge branch 'maint-0.2.1' into maint-0.2.2

doc/spec/README | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)