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

[erinn@xxxxxxxxxxxxxx]

commit 4bbf121d16d4e1e4a06211db32d2cb02e2313c8f
Merge: 0220d0a 196ebd2
Author: Erinn Clark <erinn@xxxxxxxxxxxxxx>
Date:   Tue Sep 4 14:46:10 2012 +0100

    Merge branch 'maint-2.3'

 build-scripts/osx-alpha.mk |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits