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

[erinn at torproject.org]

commit cd8ddac77ef15a29f4fe565ed1331bde93d63f7a
Merge: 5d8a02f 0a1b834
Author: Erinn Clark <erinn at torproject.org>
Date:   Mon Dec 3 21:07:27 2012 +0000

    Merge branch 'maint-2.3' into maint-2.4

 build-scripts/recommended-versions |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)