[tbb-commits] [tor-browser/tor-browser-38.2.1esr-5.5-2] Merge remote-tracking branch 'arthur/16855' into tor-browser-38.2.1esr-5.5-2

[mikeperry at torproject.org]

commit 5d79d403e0963d72af518a04711f828170649134
Merge: 15243aa 3fad667
Author: Mike Perry <mikeperry-git at torproject.org>
Date:   Tue Sep 15 16:57:49 2015 -0700

    Merge remote-tracking branch 'arthur/16855' into tor-browser-38.2.1esr-5.5-2

 docshell/base/nsDocShell.cpp |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)