commit a1020540940e2d2d086e7d944ec9534b3fe54339 Author: Sukhbir Singh sukhbir@torproject.org Date: Fri Sep 30 20:06:48 2016 -0400

Hold conversations by default (see #20208) --- projects/instantbird/preferences.patch | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/projects/instantbird/preferences.patch b/projects/instantbird/preferences.patch index 3c75b02..bcca575 100644 --- a/projects/instantbird/preferences.patch +++ b/projects/instantbird/preferences.patch @@ -116,7 +116,7 @@ diff --git a/im/app/profile/all-instantbird.js b/im/app/profile/all-instantbird.

// We have an Error Console menu item by default so let's display chrome errors pref("javascript.options.showInConsole", true); -@@ -300,14 +302,73 @@ +@@ -300,14 +302,76 @@ // 3 at the end of the tabstrip pref("browser.tabs.closeButtons", 1);

@@ -193,3 +193,6 @@ diff --git a/im/app/profile/all-instantbird.js b/im/app/profile/all-instantbird. + +// Other Updates +pref("app.update.promptWaitTime", 3600); ++ ++// Put conversations on hold so that OTR disconnect is not sent. See #20208. ++pref("messenger.conversations.holdByDefault", true);