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

[nickm at torproject.org]

commit d29c2eb9214a82653a18d51e643d637851dcd145
Merge: 69ff26b 10d6706
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sun May 15 19:56:27 2011 -0400

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

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