commit cb3c3c63cb5d0ee1a927dd9cc2fc67d3cc7bc88f Merge: f9bb3ce dbd4a01 Author: Roger Dingledine arma@torproject.org Date: Tue Mar 8 16:14:53 2011 -0500

Merge branch 'maint-0.2.2'

doc/HACKING | 41 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 41 insertions(+), 0 deletions(-)