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

23 Nov 2011


      commit 281aa2e237586a1086c3f589ed35a74eda4f1a27
Merge: e18fa28 841247a
Author: Nick Mathewson <nickm@torproject.org>
Date:   Wed Nov 23 12:12:52 2011 -0500

    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