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

17 Dec 2011


      commit d37cb8f74aa741cebe0001a4b56bd2bae539e225
Merge: 9df0bf7 cefff11
Author: Nick Mathewson <nickm@torproject.org>
Date:   Fri Dec 16 17:50:54 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