commit 30bdf17443a32c902f623af4de0736adb3976b25 Merge: 58b604e 5630a27 Author: Mike Perry <mikeperry-git@torproject.org> Date: Wed Oct 8 14:23:52 2014 -0700 Merge remote-tracking branch 'brade/bug4234-esr31-fixup-01' into tor-browser-31.1.1esr-4.x-1 tools/update-packaging/common.sh | 4 +++- tools/update-packaging/make_full_update.sh | 4 ++-- tools/update-packaging/make_incremental_update.sh | 5 +++-- 3 files changed, 8 insertions(+), 5 deletions(-)