[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'

[nickm at torproject.org]

commit 18126f92a74e9e1d81f9abf02bda2f5458c32bc6
Merge: 8b393af 4762118
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Mar 28 12:17:35 2011 -0400

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

 changes/bug2698 |    6 ++++++
 configure.in    |   18 +++++++++++++++---
 2 files changed, 21 insertions(+), 3 deletions(-)