commit 3d4c2ffa30e75b25f1fc1bacbc224ce8b69b68ba Merge: 108f48d e606f19 Author: Nick Mathewson <nickm@torproject.org> Date: Tue Feb 22 15:58:50 2011 -0500 Merge remote branch 'origin/maint-0.2.2' changes/torspec.git | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-)