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

[nickm at torproject.org]

commit ced06a80097d2c4f26b1f44447710ec33b9d2421
Merge: 1f7b9e6 d29c2eb
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sun May 15 19:56:40 2011 -0400

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

 src/common/di_ops.c |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)