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

[arma at torproject.org]

commit ed808143682bbd151df9ff84efffa084a36e6b33
Merge: 4bb1f69 cba1d29
Author: Roger Dingledine <arma at torproject.org>
Date:   Wed Apr 27 15:55:07 2011 -0400

    Merge branch 'maint-0.2.2' into release-0.2.2

 changes/microdesc-double-free |    7 +++++++
 src/or/circuituse.c           |    9 +++++----
 src/or/dirserv.h              |    2 +-
 src/or/routerparse.c          |    1 +
 4 files changed, 14 insertions(+), 5 deletions(-)