- tor-commits - lists.torproject.org

[webwml/staging] Explicit mention of exclude=tor for fedora-updates
by arma＠torproject.org 09 Mar '16

09 Mar '16

commit 5dcccb988c092960cce7ae47d51207680dfb6bef Author: Ondrej Mikle <hiviah(a)torproject.org> Date: Mon Jan 4 10:27:05 2016 +0100 Explicit mention of exclude=tor for fedora-updates --- docs/en/rpms.wml | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/en/rpms.wml b/docs/en/rpms.wml index bb0d233..45f138e 100644 --- a/docs/en/rpms.wml +++ b/docs/en/rpms.wml @@ -67,6 +67,7 @@ repo_gpgcheck=1 <p>E.g. you may exclude EPEL's Tor package by putting the mentioned exclude line under [epel] section in <tt>/etc/yum.repos.d/epel.repo</tt>. + For Fedora, you usually need that exclude in fedora-updates.repo file. </p> <h3>Package installation and running</h3>

1 0

[webwml/staging] Explicit mention of exclude=tor for fedora.repo
by arma＠torproject.org 09 Mar '16

09 Mar '16

commit 941f289c899e46f314bf06025c74d57773f36093 Author: Ondrej Mikle <hiviah(a)torproject.org> Date: Mon Jan 4 10:29:32 2016 +0100 Explicit mention of exclude=tor for fedora.repo --- docs/en/rpms.wml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/en/rpms.wml b/docs/en/rpms.wml index 45f138e..158f9fa 100644 --- a/docs/en/rpms.wml +++ b/docs/en/rpms.wml @@ -67,7 +67,8 @@ repo_gpgcheck=1 <p>E.g. you may exclude EPEL's Tor package by putting the mentioned exclude line under [epel] section in <tt>/etc/yum.repos.d/epel.repo</tt>. - For Fedora, you usually need that exclude in fedora-updates.repo file. + For Fedora, you usually need that exclude in fedora.repo and + fedora-updates.repo file. </p> <h3>Package installation and running</h3>

1 0

[webwml/staging] Add new TBB version
by arma＠torproject.org 09 Mar '16

09 Mar '16

commit cb1272b4d9c05c16558dce154090f33df15bea13 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jan 7 08:46:33 2016 +0000 Add new TBB version --- include/versions.wmi | 12 ++++++------ projects/torbrowser/RecommendedTBBVersions | 4 ++++ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/include/versions.wmi b/include/versions.wmi index 287c49d..f073126 100644 --- a/include/versions.wmi +++ b/include/versions.wmi @@ -18,10 +18,10 @@ <define-tag version-osx-ppc-stable whitespace=delete>0.2.3.25</define-tag> <define-tag version-osx-ppc-alpha whitespace=delete>0.2.4.17-rc</define-tag> -<define-tag version-torbrowserbundledir whitespace=delete>5.0.6</define-tag> +<define-tag version-torbrowserbundledir whitespace=delete>5.0.7</define-tag> <define-tag version-torbrowserbundlebetadir whitespace=delete>5.5a5</define-tag> -<define-tag version-torbrowserbundle whitespace=delete>5.0.6</define-tag> +<define-tag version-torbrowserbundle whitespace=delete>5.0.7</define-tag> <define-tag version-torbrowserbundlebeta whitespace=delete>5.5a5</define-tag> <define-tag version-torbrowser-tor whitespace=delete>0.2.4.19</define-tag> <define-tag version-torbrowser-tor-components whitespace=delete>libevent-2.0.21-stable, zlib-1.2.8, openssl-1.0.1e</define-tag> @@ -31,8 +31,8 @@ <define-tag version-torbrowser-otr whitespace=delete>3.2</define-tag> <define-tag version-torimbrowserbundle whitespace=delete>1.3.21</define-tag> -<define-tag version-torbrowserbundlelinux32 whitespace=delete>5.0.6</define-tag> -<define-tag version-torbrowserbundlelinux64 whitespace=delete>5.0.6</define-tag> +<define-tag version-torbrowserbundlelinux32 whitespace=delete>5.0.7</define-tag> +<define-tag version-torbrowserbundlelinux64 whitespace=delete>5.0.7</define-tag> <define-tag version-torbrowserbundlelinux32beta whitespace=delete>5.5a5</define-tag> <define-tag version-torbrowserbundlelinux64beta whitespace=delete>5.5a5</define-tag> <define-tag version-gnu-torbrowser-tor whitespace=delete>0.2.4.19</define-tag> @@ -40,8 +40,8 @@ <define-tag version-gnu-torbrowser-firefox whitespace=delete>24.2.0esr</define-tag> <define-tag version-gnu-torbrowser-torbutton whitespace=delete>1.5.2</define-tag> -<define-tag version-torbrowserbundleosx32 whitespace=delete>5.0.6</define-tag> -<define-tag version-torbrowserbundleosx64 whitespace=delete>5.0.6</define-tag> +<define-tag version-torbrowserbundleosx32 whitespace=delete>5.0.7</define-tag> +<define-tag version-torbrowserbundleosx64 whitespace=delete>5.0.7</define-tag> <define-tag version-torbrowserbundleosx64beta whitespace=delete>5.5a5</define-tag> <define-tag version-osx-torbrowser-tor whitespace=delete>0.2.4.19</define-tag> <define-tag version-osx-torbrowser-firefox whitespace=delete>24.2.0esr</define-tag> diff --git a/projects/torbrowser/RecommendedTBBVersions b/projects/torbrowser/RecommendedTBBVersions index b0a53b2..e77f912 100644 --- a/projects/torbrowser/RecommendedTBBVersions +++ b/projects/torbrowser/RecommendedTBBVersions @@ -3,6 +3,10 @@ "5.0.6-Linux", "5.0.6-MacOS", "5.0.6-Windows", +"5.0.7", +"5.0.7-Linux", +"5.0.7-MacOS", +"5.0.7-Windows", "5.5a5", "5.5a5-Linux", "5.5a5-MacOS",

1 0

[webwml/staging] Rename arm to nyx on the volunteer page
by arma＠torproject.org 09 Mar '16

09 Mar '16

commit 039803c9332938af6d3ead279fc300391c05ee86 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Jan 5 08:34:19 2016 -0800 Rename arm to nyx on the volunteer page I'm still holding off on the bulk of the rename until our next release (no reason to confuse its existing users with its name change), but contributors can handle it. Link was broken - thanks to unixninja92 for pointing it out... https://trac.torproject.org/projects/tor/ticket/18000 --- getinvolved/en/volunteer.wml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/getinvolved/en/volunteer.wml b/getinvolved/en/volunteer.wml index a15c952..7ea98e6 100644 --- a/getinvolved/en/volunteer.wml +++ b/getinvolved/en/volunteer.wml @@ -157,7 +157,7 @@ meetings around the world.</li> </tr> <tr> - <td><a href="#project-arm">Arm</a></td> + <td><a href="#project-nyx">Nyx</a></td> <td>User Interface</td> <td>Python, Curses</td> <td>Light</td> @@ -450,14 +450,14 @@ meetings around the world.</li> more secure. </p> - <a id="project-arm"></a> - <h3><a href="https://www.atagar.com/arm/">Arm</a> (<a - href="https://gitweb.torproject.org/arm.git">code</a>, <a + <a id="project-nyx"></a> + <h3><a href="https://www.atagar.com/arm/">Nyx</a> (<a + href="https://gitweb.torproject.org/nyx.git">code</a>, <a href="https://trac.torproject.org/projects/tor/query?status=accepted&status=assig…">bug tracker</a>)</h3> <p> - The anonymizing relay monitor (arm) is a terminal status monitor for Tor, + Nyx (previously <i>arm</i>) is a terminal status monitor for Tor intended for command-line aficionados, ssh connections, and anyone with a tty terminal. This works much like top does for system usage, providing real time statistics for bandwidth, resource usage, connections, and quite

1 0

[webwml/master] Add Tor Messenger to projects page
by arma＠torproject.org 09 Mar '16

09 Mar '16

commit bad7ac947948508e9072dcacd9b0763a832767f8 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Tue Jan 19 14:41:12 2016 -0500 Add Tor Messenger to projects page --- images/icon-TorMessenger.png | Bin 0 -> 2762 bytes projects/en/projects.wml | 9 +++++++++ 2 files changed, 9 insertions(+) diff --git a/images/icon-TorMessenger.png b/images/icon-TorMessenger.png new file mode 100644 index 0000000..8d3c2f5 Binary files /dev/null and b/images/icon-TorMessenger.png differ diff --git a/projects/en/projects.wml b/projects/en/projects.wml index 191da2e..256f96f 100644 --- a/projects/en/projects.wml +++ b/projects/en/projects.wml @@ -43,6 +43,15 @@ interested in detailed statistics about Tor.</p> </div></div> <div class="projectbox"> +<a href="<page projects/tormessenger>"><img class="icon" +src="$(IMGROOT)/icon-TorMessenger.png" height="80px" alt="" width="75"></a> +<div class="projectdesc"><div class="name"><a +href="<page projects/tormessenger>">Tor Messenger</a></div> +<p>Tor Messenger is a cross-platform chat program that aims to be secure by +default and sends all of its traffic over Tor.</p> +</div></div> + +<div class="projectbox"> <a href="<page projects/obfsproxy>"><img class="icon" src="$(IMGROOT)/icon-Obfsproxy.jpg" height="80px" alt="" width="78"></a> <div class="projectdesc"><div class="name"><a

1 0

[webwml/master] Add placeholder for Tor Messenger page
by arma＠torproject.org 09 Mar '16

09 Mar '16

commit 0a5b94273f750562224a42f6ef599f78d2bfd610 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Tue Jan 19 15:02:51 2016 -0500 Add placeholder for Tor Messenger page --- projects/en/tormessenger.wml | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/projects/en/tormessenger.wml b/projects/en/tormessenger.wml new file mode 100644 index 0000000..e69de29

1 0

[webwml/master] Add redirect to Tor Messenger wiki
by arma＠torproject.org 09 Mar '16

09 Mar '16

commit 95253e708d59e206721b130296d477e000da41b1 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Wed Mar 9 13:50:22 2016 -0500 Add redirect to Tor Messenger wiki --- projects/en/tormessenger.wml | 1 + 1 file changed, 1 insertion(+) diff --git a/projects/en/tormessenger.wml b/projects/en/tormessenger.wml index e69de29..1bc472b 100644 --- a/projects/en/tormessenger.wml +++ b/projects/en/tormessenger.wml @@ -0,0 +1 @@ +#include "head.wmi" TITLE="Redirecting" REDIRECT="https://trac.torproject.org/projects/tor/wiki/doc/TorMessenger"

1 0

[webwml/master] put a footer on the tormessenger redirect
by arma＠torproject.org 09 Mar '16

09 Mar '16

commit 9f831c028cfd811624b8d8c67ed6e0dd60d655ba Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Mar 9 14:19:46 2016 -0500 put a footer on the tormessenger redirect --- projects/en/tormessenger.wml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/projects/en/tormessenger.wml b/projects/en/tormessenger.wml index 1bc472b..b705140 100644 --- a/projects/en/tormessenger.wml +++ b/projects/en/tormessenger.wml @@ -1 +1,4 @@ #include "head.wmi" TITLE="Redirecting" REDIRECT="https://trac.torproject.org/projects/tor/wiki/doc/TorMessenger" + +#include <foot.wmi> +

1 0

[tor-messenger-build/master] Update libotr to 4.1.1 (patch by Nicolas)
by sukhbir＠torproject.org 09 Mar '16

09 Mar '16

commit 91911de3fad99884ab7fe3d5f1616422a4e25ee5 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Wed Mar 9 14:15:57 2016 -0500 Update libotr to 4.1.1 (patch by Nicolas) --- keyring/libotr.gpg | Bin 3238 -> 5304 bytes projects/libotr/bugs-otr-im-72.patch | 60 ----------------------------------- projects/libotr/build | 1 - projects/libotr/config | 3 +- 4 files changed, 1 insertion(+), 63 deletions(-) diff --git a/keyring/libotr.gpg b/keyring/libotr.gpg index a7a2d09..03efcd9 100644 Binary files a/keyring/libotr.gpg and b/keyring/libotr.gpg differ diff --git a/projects/libotr/bugs-otr-im-72.patch b/projects/libotr/bugs-otr-im-72.patch deleted file mode 100644 index a56dda3..0000000 --- a/projects/libotr/bugs-otr-im-72.patch +++ /dev/null @@ -1,60 +0,0 @@ -From f466e0c698d022cbd6ddb279e1ca4c84a0703b3b Mon Sep 17 00:00:00 2001 -From: David Goulet <dgoulet(a)ev0ke.net> -Date: Tue, 18 Aug 2015 09:32:19 +0200 -Subject: [PATCH] Fix: set to NULL the sendsmp pointer when handling SMP - -Also, for extra precaution, set the message pointer in -otrl_proto_create_data() to NULL at the beginning. - -Fixes #72 - -Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> ---- - src/message.c | 4 ++-- - src/proto.c | 4 ++-- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/message.c b/src/message.c -index f17e5e1..9572fc9 100644 ---- a/src/message.c -+++ b/src/message.c -@@ -1502,7 +1502,7 @@ int otrl_message_receiving(OtrlUserState us, const OtrlMessageAppOps *ops, - unsigned char* nextmsg; - int nextmsglen; - OtrlTLV *sendtlv; -- char *sendsmp; -+ char *sendsmp = NULL; - otrl_sm_step3(context->smstate, tlv->data, - tlv->len, &nextmsg, &nextmsglen); - -@@ -1557,7 +1557,7 @@ int otrl_message_receiving(OtrlUserState us, const OtrlMessageAppOps *ops, - unsigned char* nextmsg; - int nextmsglen; - OtrlTLV *sendtlv; -- char *sendsmp; -+ char *sendsmp = NULL; - err = otrl_sm_step4(context->smstate, tlv->data, - tlv->len, &nextmsg, &nextmsglen); - /* Set trust level based on result */ -diff --git a/src/proto.c b/src/proto.c -index f560a82..a8813ab 100644 ---- a/src/proto.c -+++ b/src/proto.c -@@ -497,6 +497,8 @@ gcry_error_t otrl_proto_create_data(char **encmessagep, ConnContext *context, - char *msgdup; - int version = context->protocol_version; - -+ *encmessagep = NULL; -+ - /* Make sure we're actually supposed to be able to encrypt */ - if (context->msgstate != OTRL_MSGSTATE_ENCRYPTED || - context->context_priv->their_keyid == 0) { -@@ -511,8 +513,6 @@ gcry_error_t otrl_proto_create_data(char **encmessagep, ConnContext *context, - } - strcpy(msgdup, msg); - -- *encmessagep = NULL; -- - /* Header, msg flags, send keyid, recv keyid, counter, msg len, msg - * len of revealed mac keys, revealed mac keys, MAC */ - buflen = OTRL_HEADER_LEN + (version == 3 ? 8 : 0) diff --git a/projects/libotr/build b/projects/libotr/build index 30ec46c..4cf811c 100755 --- a/projects/libotr/build +++ b/projects/libotr/build @@ -13,7 +13,6 @@ distdir=/var/tmp/dist/[% project %] mkdir -p /var/tmp/build tar -C /var/tmp/build -xf libotr-[% c('version') %].tar.gz cd /var/tmp/build/libotr-[% c('version') %] -patch -p1 < $rootdir/bugs-otr-im-72.patch export SOURCE_DATE_EPOCH=$(stat -c %Y ChangeLog) ./configure --prefix=$distdir [% c("var/configure_opt") %] make -j4 [% IF c("var/windows") %]LDFLAGS='-no-undefined -lssp'[% END %] diff --git a/projects/libotr/config b/projects/libotr/config index 21e52e3..6bb1826 100644 --- a/projects/libotr/config +++ b/projects/libotr/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 4.1.0 +version: 4.1.1 filename: 'libotr-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' remote_docker: 1 var: @@ -25,7 +25,6 @@ input_files: file_gpg_id: 1 sig_ext: asc gpg_keyring: libotr.gpg - - filename: bugs-otr-im-72.patch - project: libgcrypt name: libgcrypt - project: libgpg-error

1 0

[stem/master] Fix misspelled terminal text attribute
by atagar＠torproject.org 09 Mar '16

09 Mar '16

commit 95c9ba2d110103c0b6623531daa0df057af29b1f Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Mar 9 09:03:33 2016 -0800 Fix misspelled terminal text attribute Misspelled 'HIGHLIGHT' as 'HILIGHT' for an enum. Old name will still work until our 2.0.x release. --- stem/util/term.py | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/stem/util/term.py b/stem/util/term.py index 94057bb..3287bb1 100644 --- a/stem/util/term.py +++ b/stem/util/term.py @@ -13,7 +13,7 @@ Utilities for working with the terminal. .. data:: Color (enum) .. data:: BgColor (enum) - Enumerations for foreground or background terminal color. + Foreground or background terminal colors. =========== =========== Color Description @@ -30,13 +30,13 @@ Utilities for working with the terminal. .. data:: Attr (enum) - Enumerations of terminal text attributes. + Terminal text attributes. =================== =========== Attr Description =================== =========== **BOLD** heavy typeface - **HILIGHT** inverted foreground and background + **HIGHLIGHT** inverted foreground and background **UNDERLINE** underlined text **READLINE_ESCAPE** wrap encodings in `RL_PROMPT_START_IGNORE and RL_PROMPT_END_IGNORE sequences <https://stackoverflow.com/questions/9468435/look-how-to-fix-column-calculat…>`_ =================== =========== @@ -54,12 +54,12 @@ DISABLE_COLOR_SUPPORT = False Color = stem.util.enum.Enum(*TERM_COLORS) BgColor = stem.util.enum.Enum(*['BG_' + color for color in TERM_COLORS]) -Attr = stem.util.enum.Enum('BOLD', 'UNDERLINE', 'HILIGHT', 'READLINE_ESCAPE') +Attr = stem.util.enum.Enum('BOLD', 'UNDERLINE', 'HIGHLIGHT', 'READLINE_ESCAPE') # mappings of terminal attribute enums to their ANSI escape encoding FG_ENCODING = dict([(list(Color)[i], str(30 + i)) for i in range(8)]) BG_ENCODING = dict([(list(BgColor)[i], str(40 + i)) for i in range(8)]) -ATTR_ENCODING = {Attr.BOLD: '1', Attr.UNDERLINE: '4', Attr.HILIGHT: '7'} +ATTR_ENCODING = {Attr.BOLD: '1', Attr.UNDERLINE: '4', Attr.HIGHLIGHT: '7'} CSI = '\x1B[%sm' RESET = CSI % '0' @@ -96,6 +96,12 @@ def format(msg, *attr): encodings = [] for text_attr in attr: + # TODO: Account for an earlier misspelled attribute. This should be dropped + # in Stem. 2.0.x. + + if text_attr == 'HILIGHT': + text_attr = 'HIGHLIGHT' + text_attr, encoding = stem.util.str_tools._to_camel_case(text_attr), None encoding = FG_ENCODING.get(text_attr, encoding) encoding = BG_ENCODING.get(text_attr, encoding)

1 0