[tbb-commits] [tor-browser/tor-browser-68.1.0esr-9.0-2] Bug 31491: clean up the old meek http helper browser profiles

[gk at torproject.org]

commit e0b00a89e00e8f808c8d36e1f792e96d3d3a0f7c
Author: Kathy Brade <brade at pearlcrescent.com>
Date:   Thu Sep 19 14:59:45 2019 -0400

    Bug 31491: clean up the old meek http helper browser profiles
    
    On Linux and Windows, arrange for the updater to remove the old
    meek and moat http helper profiles by adding appropriate directives
    to browser/installer/removed-files.in (on macOS, the cleanup will
    be done by Tor Launcher).
---
 browser/installer/removed-files.in | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/browser/installer/removed-files.in b/browser/installer/removed-files.in
index 5d642d296ad8..732caf50db73 100644
--- a/browser/installer/removed-files.in
+++ b/browser/installer/removed-files.in
@@ -8,6 +8,20 @@
 # file and directory removals automatically so this file should not be used in
 # the vast majority of cases.
 
+#ifndef XP_MACOSX
+# Tor Browser no longer uses http helper profiles for meek and moat.
+# For macOS, the profiles are created under TorBrowser-Data and
+# Tor Launcher takes care of removing them during browser startup.
+# For Linux and Windows, the profiles were embedded in the install
+# directory and, if meek or moat was ever used, extra files that
+# were not part of the browser package will have been created within
+# the profile directories. The following two lines cause "rmrfdir"
+# directives to be added to our MAR files to cause the updater to
+# recursively remove these profile directories and everything in them.
+TorBrowser/Data/Browser/profile.meek-http-helper/*
+TorBrowser/Data/Browser/profile.moat-http-helper/*
+#endif
+
 # When to use removed-files.in file to remove files and directories:
 # * Empty directories that were accidentally added to the installation
 #   directory.