[tor-commits] [tor-browser/tor-browser-17.0.9esr-1] Merge remote-tracking branch 'brade/bug9173' into tor-browser-17.0.9esr-1

[mikeperry at torproject.org]

commit f24ed2d49e08ce23f231cb963b2c45a2ced46535
Merge: 4c2763a 0cfceec
Author: Mike Perry <mikeperry-git at torproject.org>
Date:   Thu Oct 17 17:38:16 2013 -0700

    Merge remote-tracking branch 'brade/bug9173' into tor-browser-17.0.9esr-1

 toolkit/xre/nsXREDirProvider.cpp |   17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)