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

[mikeperry at torproject.org]

commit 938e0193344a1a8b15c89c548cafa34b1fe301c1
Merge: 3aa9cc2 a630981
Author: Mike Perry <mikeperry-git at fscked.org>
Date:   Tue Apr 23 16:31:05 2013 -0700

    Merge branch 'maint-2.4'

 build-scripts/versions-alpha.mk   |    5 +++--
 build-scripts/versions.mk         |    4 ++--
 watch-scripts/fetch-thirdparty.sh |   13 +++++++++----
 watch-scripts/verify-mirror.sh    |    4 ++--
 watch-scripts/versions.sh         |    5 ++++-
 5 files changed, 20 insertions(+), 11 deletions(-)