commit ba4e48dc4092f77534f84803550e98ea7a0baaf8
Merge: 0f1ea47ff08d f37cacf58258
Author: Matthew Finkel <sys...@torproject.org>
Date: Sat Nov 7 21:21:49 2020 +0000
Merge remote-tracking branch 'acatgl/27002' into
tor-browser-78.4.0esr-10.5-1
dom/base/nsNodeInfoManager.cpp | 18 ++++++++++-------
layout/svg/tests/file_disabled_iframe.html | 31 +++++++++++++++++++++++++++++-
2 files changed, 41 insertions(+), 8 deletions(-)
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
