March 2016 - tor-commits - lists.torproject.org

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

10 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 10 Mar '16

10 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 10 Mar '16

10 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 10 Mar '16

10 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

[webwml/master] Drop another reference to OPW
by atagar＠torproject.org 09 Mar '16

09 Mar '16

commit 8c266971af356c1fc0226a9ff10cd85a1215029e Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Mar 9 08:19:43 2016 -0800 Drop another reference to OPW We're not taking part in it and even if we were, iirc it goes by another name now. --- getinvolved/en/volunteer.wml | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/getinvolved/en/volunteer.wml b/getinvolved/en/volunteer.wml index 88b6e0d..93c1239 100644 --- a/getinvolved/en/volunteer.wml +++ b/getinvolved/en/volunteer.wml @@ -826,14 +826,12 @@ meetings around the world.</li> <p> You may find some of these projects to be good ideas for <a href="<page - about/gsoc>">Google Summer of Code</a> and the <a - href="https://live.gnome.org/OutreachProgramForWomen">Outreach Program for - Women</a>. We have labelled each idea with which of our <a href="<page - about/corepeople>">core developers</a> would be good mentors. If one or - more of these ideas looks promising to you, please <a href="<page - about/contact>">contact us</a> to discuss your plans rather than sending - blind applications. You may also want to propose your own project idea - — which often results in the best applications. + about/gsoc>">Google Summer of Code</a>. We have labelled each idea with + which of our <a href="<page about/corepeople>">core developers</a> would be + good mentors. If one or more of these ideas looks promising to you, please + <a href="<page about/contact>">contact us</a> to discuss your plans rather + than sending blind applications. You may also want to propose your own + project idea — which often results in the best applications. </p> <ol>

1 0

[tor/master] Merge branch 'maint-0.2.4' into maint-0.2.5
by nickm＠torproject.org 09 Mar '16

09 Mar '16

commit 21f9829e793fd9074c568ffffbee548e345536df Merge: ce289e2 8e2640b Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 9 10:36:20 2016 -0500 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/geoip-march2016 | 4 + src/config/geoip | 8496 +++++++++++++++++++++++++++++++---------------- src/config/geoip6 | 2270 ++++++------- 3 files changed, 6524 insertions(+), 4246 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.2.5' into maint-0.2.6
by nickm＠torproject.org 09 Mar '16

09 Mar '16

commit 443dddb74966eea0b30231b9f18b80b9372f2210 Merge: 740421a 21f9829 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 9 10:36:35 2016 -0500 Merge branch 'maint-0.2.5' into maint-0.2.6 changes/geoip-march2016 | 4 + src/config/geoip | 8496 +++++++++++++++++++++++++++++++---------------- src/config/geoip6 | 2270 ++++++------- 3 files changed, 6524 insertions(+), 4246 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.2.6' into maint-0.2.7
by nickm＠torproject.org 09 Mar '16

09 Mar '16

commit 17cfdb358cae63477a120182784599dae0538cd7 Merge: 67e5d49 443dddb Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 9 10:36:50 2016 -0500 Merge branch 'maint-0.2.6' into maint-0.2.7 changes/geoip-march2016 | 4 + src/config/geoip | 8496 +++++++++++++++++++++++++++++++---------------- src/config/geoip6 | 2270 ++++++------- 3 files changed, 6524 insertions(+), 4246 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.2.7'
by nickm＠torproject.org 09 Mar '16

09 Mar '16

commit 58bcae37a2c63db81c8c0f8fdf47d886f072209a Merge: 63b4ce1 17cfdb3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 9 10:37:00 2016 -0500 Merge branch 'maint-0.2.7' changes/geoip-march2016 | 4 + src/config/geoip | 8496 +++++++++++++++++++++++++++++++---------------- src/config/geoip6 | 2270 ++++++------- 3 files changed, 6524 insertions(+), 4246 deletions(-)

1 0