commit 4740311d182f5a635f0761b9968f6511509894c0 Merge: 92e607d 48c4d53 Author: Nick Mathewson nickm@torproject.org Date: Thu Mar 10 16:11:39 2011 -0500

Merge remote branch 'origin/maint-0.2.2'

doc/HACKING | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-)