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

3 May 2011


      commit 97a55b80894b2816f435a1ee06a2549f0da72939
Merge: 1f97e83 56fbd72
Author: Nick Mathewson <nickm@torproject.org>
Date:   Tue May 3 16:46:28 2011 -0400

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

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

nickm＠torproject.org