commit 108f48dfc7f1b6bdace9b859e01dbab79aeff071 Merge: 2eadbd4 4f730e4 Author: Roger Dingledine <arma@torproject.org> Date: Tue Feb 22 14:44:32 2011 -0500 Merge branch 'maint-0.2.2' doc/spec/README | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)