[tor-commits] [tor/release-0.2.2] Merge branch 'maint-0.2.2' into release-0.2.2

[nickm at torproject.org]

commit e68f9cc9b863b22d4ccdcb711b35965445d0acca
Merge: 10d45f8 68ae5af
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue May 3 20:53:16 2011 -0400

    Merge branch 'maint-0.2.2' into release-0.2.2

 changes/bug2230_clean_1 |    4 ++
 changes/bug2230_part1   |    7 +++
 changes/bug2230_part2   |    5 ++
 changes/bug2230_part4   |    6 +++
 doc/HACKING             |   42 ++++++++++++++++++++
 src/or/config.c         |    7 +--
 src/or/main.c           |    2 +
 src/or/microdesc.c      |  100 +++++++++++++++++++++++++++++++++++++++++-----
 src/or/microdesc.h      |    3 +-
 9 files changed, 160 insertions(+), 16 deletions(-)