[tbb-commits] [tor-browser/tor-browser-31.2.0esr-4.5-1] Merge remote-tracking branch 'tjr/tor-browser-31.2.0esr-4.x-1-build1-64bit' into tor-browser-31.2.0esr-4.5-1

[mikeperry at torproject.org]

commit be0ac860051f1c3d61ee00a5d9140595981d3f2c
Merge: e65a5a7 892f8b6
Author: Mike Perry <mikeperry-git at torproject.org>
Date:   Mon Nov 3 00:00:06 2014 -0800

    Merge remote-tracking branch 'tjr/tor-browser-31.2.0esr-4.x-1-build1-64bit' into tor-browser-31.2.0esr-4.5-1

 .mozconfig-mac                   |    4 ++--
 toolkit/library/dependentlibs.py |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)