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

26 Oct 2011


      commit 9af3a3c419fdad85933cad800a995f19bda08d28
Merge: ac115f1 c5a3664
Author: Roger Dingledine <arma@torproject.org>
Date:   Wed Oct 26 07:47:42 2011 -0400

    Merge branch 'maint-0.2.1' into maint-0.2.2

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

arma＠torproject.org