[tor-commits] [torbrowser/master] Merge branch 'master' into maint-2.2

23 Oct 2011


      commit 65c0d8b43699501e85b922468c55b574d458d69a
Merge: 151d308 7f52d9f
Author: Erinn Clark <erinn@torproject.org>
Date:   Mon Oct 24 00:11:17 2011 +0100

    Merge branch 'master' into maint-2.2

[tor-commits] [torbrowser/master] Merge branch 'master' into maint-2.2

erinn＠torproject.org