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

26 Oct 2011


      commit 2c4e89b86703f188f45f9edfc0fd3e4bbeac3511
Merge: 9625a2e f85c561
Author: Roger Dingledine <arma@torproject.org>
Date:   Wed Oct 26 17:15:09 2011 -0400

    Merge branch 'maint-0.2.2'

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

arma＠torproject.org