commit 27b3b7aa58a4cc812f4cc6e2cfc533fa429b06de Merge: 751e408 033c27a Author: Nick Mathewson nickm@torproject.org Date: Mon May 2 20:18:28 2011 -0400

Merge remote-tracking branch 'origin/maint-0.2.2'

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