tor-commits November 2016

tor-commits@lists.torproject.org

16 participants
1665 discussions

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 01 Nov '16

01 Nov '16

commit 718d2e6ede8e4a7211bd7d989825e4b05732f652 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Nov 1 15:20:04 2016 +0000 Update translations for tails-misc --- bn.po | 4 ++-- ru.po | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bn.po b/bn.po index b869ba1..f8adaa8 100644 --- a/bn.po +++ b/bn.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-02 16:02+0200\n" -"PO-Revision-Date: 2016-09-03 08:57+0000\n" +"POT-Creation-Date: 2016-09-19 13:02+0200\n" +"PO-Revision-Date: 2016-10-26 14:23+0000\n" "Last-Translator: carolyn <carolyn(a)anhalt.org>\n" "Language-Team: Bengali (http://www.transifex.com/otf/torproject/language/bn/)\n" "MIME-Version: 1.0\n" diff --git a/ru.po b/ru.po index 7a62b5a..430f21d 100644 --- a/ru.po +++ b/ru.po @@ -24,8 +24,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-02 16:02+0200\n" -"PO-Revision-Date: 2016-09-03 08:57+0000\n" +"POT-Creation-Date: 2016-09-19 13:02+0200\n" +"PO-Revision-Date: 2016-10-27 13:07+0000\n" "Last-Translator: carolyn <carolyn(a)anhalt.org>\n" "Language-Team: Russian (http://www.transifex.com/otf/torproject/language/ru/)\n" "MIME-Version: 1.0\n"

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 01 Nov '16

01 Nov '16

commit 01260f1694e02acf920343621e2acadf2c76a0b6 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Nov 1 15:19:01 2016 +0000 Update translations for https_everywhere --- bn/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bn/https-everywhere.dtd b/bn/https-everywhere.dtd index c9ba28e..9e53428 100644 --- a/bn/https-everywhere.dtd +++ b/bn/https-everywhere.dtd @@ -52,6 +52,6 @@ <!ENTITY https-everywhere.chrome.rule_name "Rule name"> <!ENTITY https-everywhere.chrome.regex "Matching regex"> <!ENTITY https-everywhere.chrome.redirect_to "Redirect to"> -<!ENTITY https-everywhere.chrome.status_cancel_button "Cancel"> +<!ENTITY https-everywhere.chrome.status_cancel_button "বাতিল">

1 0

[metrics-web/master] Some changes toward the standard metrics-project layout.
by karsten＠torproject.org 01 Nov '16

01 Nov '16

commit 40d3d39361d513c083aa0f871afc518371e18be5 Author: iwakeh <iwakeh(a)torproject.org> Date: Tue Nov 1 09:37:39 2016 +0100 Some changes toward the standard metrics-project layout. Switch to java 7 and metrics-lib 1.5.0. connectbiderect not adapted. --- modules/advbwdist/build.xml | 29 +++++-------------------- modules/clients/build.xml | 29 +++++-------------------- modules/collectdescs/build.xml | 31 +++++---------------------- modules/hidserv/build.xml | 31 ++++++--------------------- modules/legacy/build.xml | 36 ++++++------------------------- shared/build-base.xml | 48 ++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 76 insertions(+), 128 deletions(-) diff --git a/modules/advbwdist/build.xml b/modules/advbwdist/build.xml index 3f9d3cb..9aa187f 100644 --- a/modules/advbwdist/build.xml +++ b/modules/advbwdist/build.xml @@ -1,36 +1,17 @@ <project default="run" name="advbwdist" basedir="."> - <property name="sources" value="src"/> - <property name="libs" value="../../shared/lib"/> - <property name="classes" value="classes"/> + <include file="../../shared/build-base.xml" as="basetask"/> + <target name="clean" depends="basetask.clean"/> + <target name="compile" depends="basetask.compile"/> + <path id="classpath"> <pathelement path="${classes}"/> + <path refid="base.classpath" /> <fileset dir="${libs}"> <include name="commons-codec-1.9.jar"/> - <include name="commons-compress-1.9.jar"/> - <include name="commons-lang-2.6.jar"/> - <include name="descriptor-1.4.0.jar"/> - <include name="slf4j-api-1.7.7.jar"/> - <include name="logback-core-1.1.2.jar"/> - <include name="logback-classic-1.1.2.jar"/> </fileset> </path> - <target name="compile"> - <mkdir dir="${classes}"/> - <javac destdir="${classes}" - srcdir="${sources}" - source="1.5" - target="1.5" - debug="true" - deprecation="true" - optimize="false" - failonerror="true" - includeantruntime="false"> - <classpath refid="classpath"/> - </javac> - </target> - <target name="run" depends="compile"> <java fork="true" maxmemory="1024m" diff --git a/modules/clients/build.xml b/modules/clients/build.xml index 64ff6dc..eb2d6e2 100644 --- a/modules/clients/build.xml +++ b/modules/clients/build.xml @@ -1,36 +1,17 @@ <project default="run" name="clients" basedir="."> - <property name="sources" value="src"/> - <property name="libs" value="../../shared/lib"/> - <property name="classes" value="classes"/> + <include file="../../shared/build-base.xml" as="basetask"/> + <target name="clean" depends="basetask.clean"/> + <target name="compile" depends="basetask.compile"/> + <path id="classpath"> <pathelement path="${classes}"/> + <path refid="base.classpath" /> <fileset dir="${libs}"> <include name="commons-codec-1.9.jar"/> - <include name="commons-compress-1.9.jar"/> - <include name="commons-lang-2.6.jar"/> - <include name="descriptor-1.4.0.jar"/> - <include name="slf4j-api-1.7.7.jar"/> - <include name="logback-core-1.1.2.jar"/> - <include name="logback-classic-1.1.2.jar"/> </fileset> </path> - <target name="compile"> - <mkdir dir="${classes}"/> - <javac destdir="${classes}" - srcdir="${sources}" - source="1.6" - target="1.6" - debug="true" - deprecation="true" - optimize="false" - failonerror="true" - includeantruntime="false"> - <classpath refid="classpath"/> - </javac> - </target> - <target name="run" depends="compile"> <java fork="true" maxmemory="2g" diff --git a/modules/collectdescs/build.xml b/modules/collectdescs/build.xml index 974a60b..7c7eb0f 100644 --- a/modules/collectdescs/build.xml +++ b/modules/collectdescs/build.xml @@ -1,35 +1,14 @@ <project default="run" name="collectdescs" basedir="."> - <property name="sources" value="src"/> - <property name="libs" value="../../shared/lib"/> - <property name="classes" value="classes"/> + <include file="../../shared/build-base.xml" as="basetask"/> + <target name="clean" depends="basetask.clean"/> + <target name="compile" depends="basetask.compile"/> + <path id="classpath"> <pathelement path="${classes}"/> - <fileset dir="${libs}"> - <include name="commons-compress-1.9.jar"/> - <include name="commons-lang-2.6.jar"/> - <include name="descriptor-1.4.0.jar"/> - <include name="slf4j-api-1.7.7.jar"/> - <include name="logback-core-1.1.2.jar"/> - <include name="logback-classic-1.1.2.jar"/> - </fileset> + <path refid="base.classpath" /> </path> - <target name="compile"> - <mkdir dir="${classes}"/> - <javac destdir="${classes}" - srcdir="${sources}" - source="1.6" - target="1.6" - debug="true" - deprecation="true" - optimize="false" - failonerror="true" - includeantruntime="false"> - <classpath refid="classpath"/> - </javac> - </target> - <target name="run" depends="compile"> <java fork="true" classname="org.torproject.metrics.collectdescs.Main"> diff --git a/modules/hidserv/build.xml b/modules/hidserv/build.xml index 4c8729c..fe073a1 100644 --- a/modules/hidserv/build.xml +++ b/modules/hidserv/build.xml @@ -1,37 +1,18 @@ <project default="run" name="hidserv" basedir="."> - <property name="sources" value="src"/> - <property name="libs" value="../../shared/lib"/> - <property name="classes" value="classes"/> + <include file="../../shared/build-base.xml" as="basetask"/> + <target name="clean" depends="basetask.clean"/> + <target name="compile" depends="basetask.compile"/> + <path id="classpath"> <pathelement path="${classes}"/> + <path refid="base.classpath" /> <fileset dir="${libs}"> <include name="commons-codec-1.9.jar"/> - <include name="commons-compress-1.9.jar"/> - <include name="commons-lang-2.6.jar"/> - <include name="descriptor-1.4.0.jar"/> - <include name="slf4j-api-1.7.7.jar"/> - <include name="logback-core-1.1.2.jar"/> - <include name="logback-classic-1.1.2.jar"/> </fileset> </path> - <target name="compile"> - <mkdir dir="${classes}"/> - <javac destdir="${classes}" - srcdir="${sources}" - source="1.6" - target="1.6" - debug="true" - deprecation="true" - optimize="false" - failonerror="true" - includeantruntime="false"> - <classpath refid="classpath"/> - </javac> - </target> - - <target name="run" depends="compile"> + <target name="run" depends="basetask.compile"> <java fork="true" maxmemory="1024m" classname="org.torproject.metrics.hidserv.Main"> diff --git a/modules/legacy/build.xml b/modules/legacy/build.xml index 07ca673..252a712 100644 --- a/modules/legacy/build.xml +++ b/modules/legacy/build.xml @@ -1,47 +1,25 @@ <project default="run" name="metrics-web" basedir="."> -  - <property name="sources" value="src"/> - <property name="libs" value="../../shared/lib"/> - <property name="classes" value="classes"/> - <property name="config" value="etc"/> + <include file="../../shared/build-base.xml" as="basetask"/> + <target name="clean" depends="basetask.clean"/> + <target name="compile" depends="basetask.compile"/> + <path id="classpath"> <pathelement path="${classes}"/> + <path refid="base.classpath" /> <fileset dir="${libs}"> <include name="commons-codec-1.9.jar"/> - <include name="commons-compress-1.9.jar"/> <include name="postgresql-jdbc3-9.2.jar"/> - <include name="commons-lang-2.6.jar"/> - <include name="descriptor-1.4.0.jar"/> - <include name="logback-classic-1.1.2.jar"/> - <include name="logback-core-1.1.2.jar"/> - <include name="slf4j-api-1.7.7.jar"/> </fileset> </path>  - <target name="init"> + <target name="init" depends="basetask.init" > <copy file="config.template" tofile="config"/> - <mkdir dir="${classes}"/> - </target> - -  - <target name="compile" depends="init"> - <javac destdir="${classes}" - srcdir="${sources}" - source="1.5" - target="1.5" - debug="true" - deprecation="true" - optimize="false" - failonerror="true" - includeantruntime="false"> - <classpath refid="classpath"/> - </javac> </target>  - <target name="run" depends="compile"> + <target name="run" depends="compile,init"> <java fork="true" maxmemory="2g" classname="org.torproject.ernie.cron.Main"> diff --git a/shared/build-base.xml b/shared/build-base.xml new file mode 100644 index 0000000..cdf4e86 --- /dev/null +++ b/shared/build-base.xml @@ -0,0 +1,48 @@ +<project basedir="."> + + <property name="sources" value="src"/> + <property name="libs" value="../../shared/lib"/> + <property name="generated" value="generated"/> + <property name="classes" value="${generated}/classes/"/> + <property name="source-and-target-java-version" value="1.7" /> + <property name="descriptorversion" value="1.5.0" /> + + <path id="base.classpath"> + <pathelement path="${classes}"/> + <fileset dir="${libs}"> + <include name="commons-compress-1.9.jar"/> + <include name="commons-lang-2.6.jar"/> + <include name="descriptor-${descriptorversion}.jar"/> + <include name="slf4j-api-1.7.7.jar"/> + <include name="logback-core-1.1.2.jar"/> + <include name="logback-classic-1.1.2.jar"/> + </fileset> + </path> + + <target name="clean"> + <delete includeEmptyDirs="true" quiet="true"> + <fileset dir="${generated}" defaultexcludes="false" includes="**" /> + </delete> + </target> + + <target name="init"> + <mkdir dir="${classes}"/> + </target> + + <target name="compile" depends="init" > + <javac destdir="${classes}" + srcdir="${sources}" + source="${source-and-target-java-version}" + target="${source-and-target-java-version}" + debug="true" debuglevel="lines,source" + deprecation="true" + optimize="false" + failonerror="true" + includeantruntime="false"> + <classpath refid="classpath"/> + </javac> + </target> + + +</project> +

1 0

[metrics-web/master] Use metrics-lib's getHidserv*() in hidserv module.
by karsten＠torproject.org 01 Nov '16

01 Nov '16

commit 96d8de82010a2ee52597c6e5d28c6bcb47a22646 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Oct 31 21:36:34 2016 +0100 Use metrics-lib's getHidserv*() in hidserv module. When Metrics' hidserv module was written in March 2015, metrics-lib did not support hidserv-* lines in extra-info descriptors, so it had to implement its own parsing code and parse extra-info descriptors a second time. This has changed in December 2015 with metrics-lib 1.1.0 adding "support for hidden-service statistics in extra-info descriptors". It's time to replace that custom parsing code in Metrics' hidserv module and use the methods provided by metrics-lib. Implements #20510. --- .../src/org/torproject/metrics/hidserv/Parser.java | 95 ++++++---------------- 1 file changed, 24 insertions(+), 71 deletions(-) diff --git a/modules/hidserv/src/org/torproject/metrics/hidserv/Parser.java b/modules/hidserv/src/org/torproject/metrics/hidserv/Parser.java index 0acdb17..2ef404e 100644 --- a/modules/hidserv/src/org/torproject/metrics/hidserv/Parser.java +++ b/modules/hidserv/src/org/torproject/metrics/hidserv/Parser.java @@ -13,7 +13,6 @@ import org.torproject.descriptor.RelayNetworkStatusConsensus; import java.io.BufferedReader; import java.io.BufferedWriter; -import java.io.ByteArrayInputStream; import java.io.File; import java.io.FileReader; import java.io.FileWriter; @@ -24,7 +23,6 @@ import java.util.Collections; import java.util.HashSet; import java.util.Iterator; import java.util.Map; -import java.util.Scanner; import java.util.Set; import java.util.SortedMap; import java.util.SortedSet; @@ -198,6 +196,8 @@ public class Parser { this.reportedHidServStatsFile, this.reportedHidServStats); } + private static final String BIN_SIZE = "bin_size"; + /** Parses the given extra-info descriptor by extracting its fingerprint * and contained hidserv-* lines. * @@ -209,85 +209,38 @@ public class Parser { /* Extract the fingerprint from the parsed descriptor. */ String fingerprint = extraInfoDescriptor.getFingerprint(); - /* Parse the descriptor once more to extract any hidserv-* lines. - * This is necessary, because these lines are not yet supported by the - * descriptor-parsing library. */ - Scanner scanner = new Scanner(new ByteArrayInputStream( - extraInfoDescriptor.getRawDescriptorBytes())); - Long statsEndMillis = null; - Long statsIntervalSeconds = null; - Long rendRelayedCells = null; - Long rendRelayedCellsBinSize = null; - Long dirOnionsSeen = null; - Long dirOnionsSeenBinSize = null; - try { - while (scanner.hasNext()) { - String line = scanner.nextLine(); - if (line.startsWith("hidserv-")) { - String[] parts = line.split(" "); - if (parts[0].equals("hidserv-stats-end")) { - /* Parse statistics end and statistics interval length. */ - if (parts.length != 5 || !parts[3].startsWith("(") - || !parts[4].equals("s)")) { - /* Will warn below, because statsEndMillis is still null. */ - continue; - } - statsEndMillis = DateTimeHelper.parse(parts[1] + " " - + parts[2]); - statsIntervalSeconds = Long.parseLong(parts[3].substring(1)); - } else if (parts[0].equals("hidserv-rend-relayed-cells")) { - /* Parse the reported number of cells on rendezvous circuits - * and the bin size used by the relay to obfuscate that - * number. */ - if (parts.length != 5 - || !parts[4].startsWith("bin_size=")) { - /* Will warn below, because rendRelayedCells is still - * null. */ - continue; - } - rendRelayedCells = Long.parseLong(parts[1]); - rendRelayedCellsBinSize = - Long.parseLong(parts[4].substring(9)); - } else if (parts[0].equals("hidserv-dir-onions-seen")) { - /* Parse the reported number of distinct .onion addresses and - * the bin size used by the relay to obfuscate that number. */ - if (parts.length != 5 - || !parts[4].startsWith("bin_size=")) { - /* Will warn below, because dirOnionsSeen is still null. */ - continue; - } - dirOnionsSeen = Long.parseLong(parts[1]); - dirOnionsSeenBinSize = Long.parseLong(parts[4].substring(9)); - } - } - } - } catch (NumberFormatException e) { - e.printStackTrace(); - return; - } - /* If the descriptor did not contain any of the expected hidserv-* * lines, don't do anything. This applies to the majority of * descriptors, at least as long as only a minority of relays reports * these statistics. */ - if (statsEndMillis == null && rendRelayedCells == null - && dirOnionsSeen == null) { + if (extraInfoDescriptor.getHidservStatsEndMillis() < 0L + && extraInfoDescriptor.getHidservRendRelayedCells() == null + && extraInfoDescriptor.getHidservDirOnionsSeen() == null) { return; /* If the descriptor contained all expected hidserv-* lines, create a * new stats object and put it in the local map, so that it will later * be written to a document file. */ - } else if (statsEndMillis != null - && statsEndMillis != DateTimeHelper.NO_TIME_AVAILABLE - && statsIntervalSeconds != null && rendRelayedCells != null - && dirOnionsSeen != null) { + } else if (extraInfoDescriptor.getHidservStatsEndMillis() >= 0L + && extraInfoDescriptor.getHidservStatsIntervalLength() >= 0L + && extraInfoDescriptor.getHidservRendRelayedCells() != null + && extraInfoDescriptor.getHidservRendRelayedCellsParameters() != null + && extraInfoDescriptor.getHidservRendRelayedCellsParameters() + .containsKey(BIN_SIZE) + && extraInfoDescriptor.getHidservDirOnionsSeen() != null + && extraInfoDescriptor.getHidservDirOnionsSeenParameters() != null + && extraInfoDescriptor.getHidservDirOnionsSeenParameters() + .containsKey(BIN_SIZE)) { ReportedHidServStats reportedStats = new ReportedHidServStats( - fingerprint, statsEndMillis); - reportedStats.setStatsIntervalSeconds(statsIntervalSeconds); - reportedStats.setRendRelayedCells(this.removeNoise(rendRelayedCells, - rendRelayedCellsBinSize)); - reportedStats.setDirOnionsSeen(this.removeNoise(dirOnionsSeen, - dirOnionsSeenBinSize)); + fingerprint, extraInfoDescriptor.getHidservStatsEndMillis()); + reportedStats.setStatsIntervalSeconds(extraInfoDescriptor + .getHidservStatsIntervalLength()); + reportedStats.setRendRelayedCells(this.removeNoise(extraInfoDescriptor + .getHidservRendRelayedCells().longValue(), extraInfoDescriptor + .getHidservRendRelayedCellsParameters().get(BIN_SIZE).longValue())); + reportedStats.setDirOnionsSeen(this.removeNoise(extraInfoDescriptor + .getHidservDirOnionsSeen().longValue(), extraInfoDescriptor + .getHidservDirOnionsSeenParameters().get(BIN_SIZE).longValue())); this.reportedHidServStats.add(reportedStats); /* If the descriptor contained some but not all hidserv-* lines, print

1 0

[tor-messenger-build/master] Add a patch for bugzilla 1313137
by arlo＠torproject.org 01 Nov '16

01 Nov '16

commit b24c72c3ecdde17daccb0337f2a727deeb09eede Author: Arlo Breault <arlolra(a)gmail.com> Date: Mon Oct 31 17:11:25 2016 -0700 Add a patch for bugzilla 1313137 * Irc "msg is not defined" error --- ChangeLog | 1 + .../0001-Set-Tor-Messenger-preferences.patch | 4 +-- ...0002-Trac-16489-Prevent-account-autologin.patch | 4 +-- ...Support-Special-Characters-input-prompt-o.patch | 4 +-- ...Better-error-reporting-for-failed-outgoin.patch | 4 +-- .../0005-Trac-13312-OTR-over-Twitter-DMs.patch | 4 +-- ...-Fix-tab-strip-background-colour-on-OS-X..patch | 4 +-- ...-XMPP-createConversation-should-handle-in.patch | 4 +-- ...-Set-_userVCard-own-property-when-downloa.patch | 4 +-- .../0009-XMPP-in-band-registration.patch | 4 +-- .../instantbird/0010-Remove-search-from-UI.patch | 4 +-- .../0011-Add-Tor-Messenger-branding.patch | 4 +-- projects/instantbird/0012-Account-picture.patch | 4 +-- .../0013-Modify-protocol-defaults.patch | 4 +-- .../instantbird/0014-Modify-IRC-defaults.patch | 4 +-- projects/instantbird/0015-Modify-themes.patch | 4 +-- .../instantbird/0016-Modify-XMPP-defaults.patch | 4 +-- projects/instantbird/0017-Remove-logging-UI.patch | 4 +-- projects/instantbird/0018-Cert-override.patch | 4 +-- .../0019-Display-all-traffic-over-Tor.patch | 4 +-- .../instantbird/0020-Trac-17480-Content-sink.patch | 4 +-- .../0021-SASL-ECDSA-NIST256P-CHALLENGE.patch | 4 +-- ...-msg-is-not-defined-error-in-irc.js-chang.patch | 29 ++++++++++++++++++++++ projects/instantbird/config | 1 + 24 files changed, 73 insertions(+), 42 deletions(-) diff --git a/ChangeLog b/ChangeLog index 54d8dcf..b529abd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,7 @@ Tor Messenger 0.3.0b1 -- * Trac 17480: Make url linkification toggleable * Update ctypes-otr to 00e4e80a * Trac 20231: Remove incomplete translations + * Fix irc "msg is not defined" error (bugzilla 1313137) * Mac * Trac 20206: Avoid prompting to download font "Osaka" on macOS Sierra * Trac 20204: Windows don't drag on macOS Sierra diff --git a/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch b/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch index cb2ac47..a99fa26 100644 --- a/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch +++ b/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch @@ -1,7 +1,7 @@ From bfa4576ff8e6291a0cd293e05ac48b2a91c6a3c1 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 19:48:41 -0700 -Subject: [PATCH 01/21] Set Tor Messenger preferences +Subject: [PATCH 01/22] Set Tor Messenger preferences --- im/app/profile/all-instantbird.js | 110 +++++++++++++++++++++++++++++++------- @@ -197,5 +197,5 @@ index b7a3970..eb1423f 100644 +// Put conversations on hold so that OTR disconnect is not sent. See #20208. +pref("messenger.conversations.holdByDefault", true); -- -2.10.1 +2.10.2 diff --git a/projects/instantbird/0002-Trac-16489-Prevent-account-autologin.patch b/projects/instantbird/0002-Trac-16489-Prevent-account-autologin.patch index df7e4c5..84b7c3c 100644 --- a/projects/instantbird/0002-Trac-16489-Prevent-account-autologin.patch +++ b/projects/instantbird/0002-Trac-16489-Prevent-account-autologin.patch @@ -1,7 +1,7 @@ From 2f9785b7fb8fba1dae99f914a7500bac41d4a17b Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Mon, 16 Nov 2015 20:37:53 -0800 -Subject: [PATCH 02/21] Trac 16489: Prevent account autologin +Subject: [PATCH 02/22] Trac 16489: Prevent account autologin --- chat/components/src/imAccounts.js | 2 +- @@ -117,5 +117,5 @@ index e5f7fb6..5e0024d 100644 <caption label="&accountsMgr.label;"/> -- -2.10.1 +2.10.2 diff --git a/projects/instantbird/0003-Trac-17896-Support-Special-Characters-input-prompt-o.patch b/projects/instantbird/0003-Trac-17896-Support-Special-Characters-input-prompt-o.patch index c801890..2b32591 100644 --- a/projects/instantbird/0003-Trac-17896-Support-Special-Characters-input-prompt-o.patch +++ b/projects/instantbird/0003-Trac-17896-Support-Special-Characters-input-prompt-o.patch @@ -1,7 +1,7 @@ From fa84f77e4b3c3091aec5a479f862aa8cdb12de6a Mon Sep 17 00:00:00 2001 From: aleth <aleth(a)instantbird.org> Date: Sat, 30 Jan 2016 20:56:38 +0100 -Subject: [PATCH 03/21] Trac 17896: Support "Special Characters" input prompt +Subject: [PATCH 03/22] Trac 17896: Support "Special Characters" input prompt on OS X * Bug 1151784 - Add Edit menu to the conversation window on OS X. r=nhnt11,florian @@ -74,5 +74,5 @@ index 30aeb1f..14fc9e8 100644 <keyset id="mainkeyset"/> <menubar id="blistMenubar"/> -- -2.10.1 +2.10.2 diff --git a/projects/instantbird/0004-Trac-17494-Better-error-reporting-for-failed-outgoin.patch b/projects/instantbird/0004-Trac-17494-Better-error-reporting-for-failed-outgoin.patch index 1623b06..cc8b392 100644 --- a/projects/instantbird/0004-Trac-17494-Better-error-reporting-for-failed-outgoin.patch +++ b/projects/instantbird/0004-Trac-17494-Better-error-reporting-for-failed-outgoin.patch @@ -1,7 +1,7 @@ From 7fcda7da8eee17eccae8e25a7a24f0b7127fc3af Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Tue, 2 Feb 2016 16:04:51 -0800 -Subject: [PATCH 04/21] Trac 17494: Better error reporting for failed outgoing +Subject: [PATCH 04/22] Trac 17494: Better error reporting for failed outgoing messages * Bug 1245325 - Better error reporting for failed outgoing messages. r=clokep @@ -63,5 +63,5 @@ index 67cab77..0022be3 100644 else if (this._isMucParticipant && muc && !muc.left && error.condition == "item-not-found") { -- -2.10.1 +2.10.2 diff --git a/projects/instantbird/0005-Trac-13312-OTR-over-Twitter-DMs.patch b/projects/instantbird/0005-Trac-13312-OTR-over-Twitter-DMs.patch index d324dc8..8cf35b0 100644 --- a/projects/instantbird/0005-Trac-13312-OTR-over-Twitter-DMs.patch +++ b/projects/instantbird/0005-Trac-13312-OTR-over-Twitter-DMs.patch @@ -1,7 +1,7 @@ From 2a8dc4c8043aeae007b4e727c54137f4ae90f3dd Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Tue, 15 Mar 2016 17:40:42 -0700 -Subject: [PATCH 05/21] Trac 13312: OTR over Twitter DMs +Subject: [PATCH 05/22] Trac 13312: OTR over Twitter DMs --- chat/components/src/imConversations.js | 4 +- @@ -1002,5 +1002,5 @@ index fac9c56..af5e4d5 100644 }; -- -2.10.1 +2.10.2 diff --git a/projects/instantbird/0006-Bug-1218193-Fix-tab-strip-background-colour-on-OS-X..patch b/projects/instantbird/0006-Bug-1218193-Fix-tab-strip-background-colour-on-OS-X..patch index d65aa4b..a87b731 100644 --- a/projects/instantbird/0006-Bug-1218193-Fix-tab-strip-background-colour-on-OS-X..patch +++ b/projects/instantbird/0006-Bug-1218193-Fix-tab-strip-background-colour-on-OS-X..patch @@ -1,7 +1,7 @@ From 10e196e6c4e26d74baacba3e2b0f367a062b0287 Mon Sep 17 00:00:00 2001 From: Nihanth Subramanya <nhnt11(a)gmail.com> Date: Sun, 9 Oct 2016 21:53:04 -0700 -Subject: [PATCH 06/21] Bug 1218193 - Fix tab strip background colour on OS X. +Subject: [PATCH 06/22] Bug 1218193 - Fix tab strip background colour on OS X. r=aleth --- @@ -22,5 +22,5 @@ index 76c5094..2915450 100644 background-repeat: repeat-x; } -- -2.10.1 +2.10.2 diff --git a/projects/instantbird/0007-Bug-1246431-XMPP-createConversation-should-handle-in.patch b/projects/instantbird/0007-Bug-1246431-XMPP-createConversation-should-handle-in.patch index b58f6b8..ac16309 100644 --- a/projects/instantbird/0007-Bug-1246431-XMPP-createConversation-should-handle-in.patch +++ b/projects/instantbird/0007-Bug-1246431-XMPP-createConversation-should-handle-in.patch @@ -1,7 +1,7 @@ From ecee8301b2187ea25e582d15e3d02bec5d29078e Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Sun, 9 Oct 2016 21:57:07 -0700 -Subject: [PATCH 07/21] Bug 1246431 - XMPP createConversation should handle +Subject: [PATCH 07/22] Bug 1246431 - XMPP createConversation should handle incoming messages from the server properly. r=aleth --- @@ -22,5 +22,5 @@ index 0022be3..4420a1d 100644 throw "Invalid JID"; } -- -2.10.1 +2.10.2 diff --git a/projects/instantbird/0008-Bug-1298574-Set-_userVCard-own-property-when-downloa.patch b/projects/instantbird/0008-Bug-1298574-Set-_userVCard-own-property-when-downloa.patch index 2a3790f..f336a84 100644 --- a/projects/instantbird/0008-Bug-1298574-Set-_userVCard-own-property-when-downloa.patch +++ b/projects/instantbird/0008-Bug-1298574-Set-_userVCard-own-property-when-downloa.patch @@ -1,7 +1,7 @@ From 899378439d41d0ee36cba761edf43e4329cd9c07 Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Sun, 28 Aug 2016 08:57:41 -0700 -Subject: [PATCH 08/21] Bug 1298574 - Set _userVCard own property when +Subject: [PATCH 08/22] Bug 1298574 - Set _userVCard own property when downloading vCard fails. r=aleth * This prevents an infinite req / res cycle. @@ -35,5 +35,5 @@ index 4420a1d..71f7770 100644 }, -- -2.10.1 +2.10.2 diff --git a/projects/instantbird/0009-XMPP-in-band-registration.patch b/projects/instantbird/0009-XMPP-in-band-registration.patch index 59f595c..41e9f90 100644 --- a/projects/instantbird/0009-XMPP-in-band-registration.patch +++ b/projects/instantbird/0009-XMPP-in-band-registration.patch @@ -1,7 +1,7 @@ From 1e0665d52f89f61af5dd07fc1d0c31dd90c0a483 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 18:42:25 -0700 -Subject: [PATCH 09/21] XMPP in-band registration +Subject: [PATCH 09/22] XMPP in-band registration --- chat/locales/en-US/xmpp.properties | 5 + @@ -392,5 +392,5 @@ index 43d0f19..c46fb2f 100644 + +<!ENTITY registerXMPP.label "Create this new account on the server"> -- -2.10.1 +2.10.2 diff --git a/projects/instantbird/0010-Remove-search-from-UI.patch b/projects/instantbird/0010-Remove-search-from-UI.patch index d50e0d0..55f22ab 100644 --- a/projects/instantbird/0010-Remove-search-from-UI.patch +++ b/projects/instantbird/0010-Remove-search-from-UI.patch @@ -1,7 +1,7 @@ From a9aa4108eceba8f5d4472b27ba7f0f3223d535bc Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 18:47:48 -0700 -Subject: [PATCH 10/21] Remove search from UI +Subject: [PATCH 10/22] Remove search from UI --- im/content/nsContextMenu.js | 18 +----------------- @@ -60,5 +60,5 @@ index fad67c1..cfe2405 100644 <groupbox> <caption label="&configEditDesc.label;"/> -- -2.10.1 +2.10.2 diff --git a/projects/instantbird/0011-Add-Tor-Messenger-branding.patch b/projects/instantbird/0011-Add-Tor-Messenger-branding.patch index 5d4b615..9b2d571 100644 --- a/projects/instantbird/0011-Add-Tor-Messenger-branding.patch +++ b/projects/instantbird/0011-Add-Tor-Messenger-branding.patch @@ -1,7 +1,7 @@ From ce1cba5c29e974399693c6b3dbd02b372a8a6ab3 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 18:56:27 -0700 -Subject: [PATCH 11/21] Add Tor Messenger branding +Subject: [PATCH 11/22] Add Tor Messenger branding --- im/app/macbuild/Contents/Info.plist.in | 2 +- @@ -5129,5 +5129,5 @@ index 15ec569..4a2d35d 100644 -Info=Instantbird is installing your updates and will start in a few moments… +Info=Tor Messenger is installing your updates and will start in a few moments… -- -2.10.1 +2.10.2 diff --git a/projects/instantbird/0012-Account-picture.patch b/projects/instantbird/0012-Account-picture.patch index 6529c84..6c48541 100644 --- a/projects/instantbird/0012-Account-picture.patch +++ b/projects/instantbird/0012-Account-picture.patch @@ -1,7 +1,7 @@ From a40ca36edcb6b2be8ed958e39479998a8fe4fbc3 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 19:24:09 -0700 -Subject: [PATCH 12/21] Account picture +Subject: [PATCH 12/22] Account picture --- im/content/blist.xul | 3 +-- @@ -22,5 +22,5 @@ index b90fdda..f29a48b 100644 <panel id="changeUserIconPanel" type="arrow" align="center" -- -2.10.1 +2.10.2 diff --git a/projects/instantbird/0013-Modify-protocol-defaults.patch b/projects/instantbird/0013-Modify-protocol-defaults.patch index 7a51c3a..cc51976 100644 --- a/projects/instantbird/0013-Modify-protocol-defaults.patch +++ b/projects/instantbird/0013-Modify-protocol-defaults.patch @@ -1,7 +1,7 @@ From 82b8069f3b5eef5d6ed8a87e8b122e2b0eae3a76 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 19:25:34 -0700 -Subject: [PATCH 13/21] Modify protocol defaults +Subject: [PATCH 13/22] Modify protocol defaults * Top protocols @@ -44,5 +44,5 @@ index d552a23..7d371bd 100644 topProtocol.prpl-twitter.description=Stay up to date with your Twitter timeline topProtocol.prpl-aim.description=Chat with your buddies on AOL Instant Messenger -- -2.10.1 +2.10.2 diff --git a/projects/instantbird/0014-Modify-IRC-defaults.patch b/projects/instantbird/0014-Modify-IRC-defaults.patch index a85bdc7..6d43240 100644 --- a/projects/instantbird/0014-Modify-IRC-defaults.patch +++ b/projects/instantbird/0014-Modify-IRC-defaults.patch @@ -1,7 +1,7 @@ From 14b1768d06adce5dd85dd56ea4c89984d420c36e Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 19:31:58 -0700 -Subject: [PATCH 14/21] Modify IRC defaults +Subject: [PATCH 14/22] Modify IRC defaults * ctcp ping @@ -61,5 +61,5 @@ index 28eb374..120be10 100644 ". Sending TIME response: \"" + now + "\"."); this.sendCTCPMessage(aMessage.origin, true, "TIME", ":" + now); -- -2.10.1 +2.10.2 diff --git a/projects/instantbird/0015-Modify-themes.patch b/projects/instantbird/0015-Modify-themes.patch index 6747420..ef7197c 100644 --- a/projects/instantbird/0015-Modify-themes.patch +++ b/projects/instantbird/0015-Modify-themes.patch @@ -1,7 +1,7 @@ From 8f6fad682f3fc785e324faf086e5248b54e50f2e Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 19:36:38 -0700 -Subject: [PATCH 15/21] Modify themes +Subject: [PATCH 15/22] Modify themes * theme extension updateh @@ -74,5 +74,5 @@ index 454e366..18ba1f9 100644 <separator class="thin"/> <description>&emoticonsPreview.description;</description> -- -2.10.1 +2.10.2 diff --git a/projects/instantbird/0016-Modify-XMPP-defaults.patch b/projects/instantbird/0016-Modify-XMPP-defaults.patch index c31d92d..202cfb1 100644 --- a/projects/instantbird/0016-Modify-XMPP-defaults.patch +++ b/projects/instantbird/0016-Modify-XMPP-defaults.patch @@ -1,7 +1,7 @@ From 7002186f102f329431ad1f1afce87af75f7a4570 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 19:38:49 -0700 -Subject: [PATCH 16/21] Modify XMPP defaults +Subject: [PATCH 16/22] Modify XMPP defaults * xmpp-default-domain @@ -44,5 +44,5 @@ index 265445a..a5635ca 100644 connection_security: { get label() { return _("options.connectionSecurity"); }, -- -2.10.1 +2.10.2 diff --git a/projects/instantbird/0017-Remove-logging-UI.patch b/projects/instantbird/0017-Remove-logging-UI.patch index f6cc574..4ac4152 100644 --- a/projects/instantbird/0017-Remove-logging-UI.patch +++ b/projects/instantbird/0017-Remove-logging-UI.patch @@ -1,7 +1,7 @@ From af2bff6a7f15123c567b4c911b5842423fee0514 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 19:50:48 -0700 -Subject: [PATCH 17/21] Remove logging UI +Subject: [PATCH 17/22] Remove logging UI --- im/content/preferences/privacy.xul | 20 -------------------- @@ -39,5 +39,5 @@ index 7c9db1c..2d7b270 100644 <groupbox id="passwordsGroup" orient="vertical"> <caption label="&passwords.label;"/> -- -2.10.1 +2.10.2 diff --git a/projects/instantbird/0018-Cert-override.patch b/projects/instantbird/0018-Cert-override.patch index 2ffbb29..bea2ec5 100644 --- a/projects/instantbird/0018-Cert-override.patch +++ b/projects/instantbird/0018-Cert-override.patch @@ -1,7 +1,7 @@ From da09cc5555865e5f86a4627d9ad1fd9de4dd392b Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 19:56:46 -0700 -Subject: [PATCH 18/21] Cert override +Subject: [PATCH 18/22] Cert override --- im/app/profile/cert_override.txt | 3 +++ @@ -60,5 +60,5 @@ index 1174b3d..3e35a2e 100644 #ifdef XP_MACOSX @RESPATH@/components/ibDockBadge.js -- -2.10.1 +2.10.2 diff --git a/projects/instantbird/0019-Display-all-traffic-over-Tor.patch b/projects/instantbird/0019-Display-all-traffic-over-Tor.patch index 8d08a6d..d1ffe21 100644 --- a/projects/instantbird/0019-Display-all-traffic-over-Tor.patch +++ b/projects/instantbird/0019-Display-all-traffic-over-Tor.patch @@ -1,7 +1,7 @@ From b4e33411b5743601307009ce6e31235fccb57ba3 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 19:58:31 -0700 -Subject: [PATCH 19/21] Display all traffic over Tor +Subject: [PATCH 19/22] Display all traffic over Tor --- im/content/accountWizard.xul | 2 ++ @@ -34,5 +34,5 @@ index c46fb2f..6b49c84 100644 <!ENTITY accountProtocolShowMore.label "Show all protocols"> <!ENTITY accountProtocolShowMore.description "Choose from the full list of protocols"> -- -2.10.1 +2.10.2 diff --git a/projects/instantbird/0020-Trac-17480-Content-sink.patch b/projects/instantbird/0020-Trac-17480-Content-sink.patch index 619ce7d..29aeaf4 100644 --- a/projects/instantbird/0020-Trac-17480-Content-sink.patch +++ b/projects/instantbird/0020-Trac-17480-Content-sink.patch @@ -1,7 +1,7 @@ From 2194d4caace6d18b2a33a57df3618019b9bc77d8 Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Wed, 5 Oct 2016 11:09:25 -0700 -Subject: [PATCH 20/21] Trac 17480: Content sink +Subject: [PATCH 20/22] Trac 17480: Content sink --- chat/modules/imContentSink.jsm | 30 +++++------------------------- @@ -97,5 +97,5 @@ index 3b8ccfa..ba41da7 100644 <menuitem value="0" label="&filterLevelNone;"/> </menupopup> -- -2.10.1 +2.10.2 diff --git a/projects/instantbird/0021-SASL-ECDSA-NIST256P-CHALLENGE.patch b/projects/instantbird/0021-SASL-ECDSA-NIST256P-CHALLENGE.patch index f50551b..7d0df64 100644 --- a/projects/instantbird/0021-SASL-ECDSA-NIST256P-CHALLENGE.patch +++ b/projects/instantbird/0021-SASL-ECDSA-NIST256P-CHALLENGE.patch @@ -1,7 +1,7 @@ From afec16433c83df4452b6b362032cd624f7f5541d Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Sun, 2 Oct 2016 08:46:55 -0700 -Subject: [PATCH 21/21] SASL ECDSA-NIST256P-CHALLENGE +Subject: [PATCH 21/22] SASL ECDSA-NIST256P-CHALLENGE --- chat/components/src/imAccounts.js | 1 + @@ -8915,5 +8915,5 @@ index bc25396..e46815d 100644 'ircCAP.jsm', 'ircCommands.jsm', -- -2.10.1 +2.10.2 diff --git a/projects/instantbird/0022-Bug-1313137-msg-is-not-defined-error-in-irc.js-chang.patch b/projects/instantbird/0022-Bug-1313137-msg-is-not-defined-error-in-irc.js-chang.patch new file mode 100644 index 0000000..f80c5e2 --- /dev/null +++ b/projects/instantbird/0022-Bug-1313137-msg-is-not-defined-error-in-irc.js-chang.patch @@ -0,0 +1,29 @@ +From 6f07adf6e3db9f65cf4c45ecaba8f1f12423acff Mon Sep 17 00:00:00 2001 +From: aleth <aleth(a)instantbird.org> +Date: Wed, 26 Oct 2016 20:16:58 +0200 +Subject: [PATCH 22/22] Bug 1313137 - "msg is not defined" error in + irc.js:changeBuddyNick. r=clokep + +--HG-- +extra : rebase_source : 5752a69059ecd48b947809ef12de177ccab8528f +--- + chat/protocols/irc/irc.js | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/chat/protocols/irc/irc.js b/chat/protocols/irc/irc.js +index c2167a5..b58c2c2 100644 +--- a/chat/protocols/irc/irc.js ++++ b/chat/protocols/irc/irc.js +@@ -1289,7 +1289,8 @@ ircAccount.prototype = { + this.conversations.set(aNewNick, conversation); + + conversation.updateNick(aNewNick); +- conversation.writeMessage(aOldNick, msg, {system: true}); ++ conversation.writeMessage(aOldNick, _conv("nickSet", aOldNick, aNewNick), ++ {system: true}); + } + }, + +-- +2.10.2 + diff --git a/projects/instantbird/config b/projects/instantbird/config index 906788a..47014bc 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -79,6 +79,7 @@ input_files: - filename: 0019-Display-all-traffic-over-Tor.patch - filename: 0020-Trac-17480-Content-sink.patch - filename: 0021-SASL-ECDSA-NIST256P-CHALLENGE.patch + - filename: 0022-Bug-1313137-msg-is-not-defined-error-in-irc.js-chang.patch - filename: 'mozconfig-[% c("var/osname") %]' name: mozconfig - name: mozilla

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits November 2016