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

16 May 2011


      commit 3c7291ce0a9799c9d128096f7880bce5a61f176a
Merge: 89ae844 2e85c3a
Author: Nick Mathewson <nickm@torproject.org>
Date:   Mon May 16 16:43:46 2011 -0400

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

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

nickm＠torproject.org