commit d67b304b20a3dbca9ad3072b33d6e1d54680f220 Merge: e8bfe89 5580fbb Author: Nick Mathewson <nickm@torproject.org> Date: Thu Jul 14 09:51:58 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' doc/HACKING | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-)