commit c48d6da24c403f6a9f8240035e8c1114cdd2eb13 Merge: daede6f dbd73b9 Author: Nick Mathewson <nickm@torproject.org> Date: Fri Apr 29 11:15:11 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' doc/HACKING | 37 +++++++++++++++++++++++++++++++++++++ src/or/config.c | 7 +++---- 2 files changed, 40 insertions(+), 4 deletions(-)