[tor-commits] [translation/tor-launcher-progress_completed] Update translations for tor-launcher-progress_completed

2015-03-10 Thread translation
commit f7255ad30e1be4d620bf0722b723c57fab1739a1 Author: Translation commit bot translat...@torproject.org Date: Tue Mar 10 10:15:35 2015 + Update translations for tor-launcher-progress_completed --- fr/progress.dtd |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

[tor-commits] [translation/tor-launcher-progress] Update translations for tor-launcher-progress

2015-03-10 Thread translation
commit 2457ea6ead42da851e8d03e81f14fea9228b Author: Translation commit bot translat...@torproject.org Date: Tue Mar 10 10:15:31 2015 + Update translations for tor-launcher-progress --- fr/progress.dtd |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

[tor-commits] [torbutton/master] Bug #15207: Check first if bridge.ID exists before using it

2015-03-10 Thread gk
commit 9714d5a8abfcc19c6c5667a8c4e3b7d064401df0 Author: Arthur Edelstein arthuredelst...@gmail.com Date: Mon Mar 9 17:24:05 2015 -0700 Bug #15207: Check first if bridge.ID exists before using it --- src/chrome/content/tor-circuit-display.js |2 +- 1 file changed, 1 insertion(+), 1

[tor-commits] [tor-browser-bundle/master] Bug 15023: Adding Linux MAR tools to SHA256 sums

2015-03-10 Thread gk
commit 8fc54b8ab6e96ff8fc722066bc7756b25d23619f Author: Georg Koppen g...@torproject.org Date: Tue Mar 10 11:34:07 2015 + Bug 15023: Adding Linux MAR tools to SHA256 sums --- gitian/mkbundle-linux.sh |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

[tor-commits] [tor/release-0.2.6] Whoops; I somehow dropped 9321 from the changelog

2015-03-10 Thread nickm
commit 2224780fc53396bff820350aa4533b107a50b052 Author: Nick Mathewson ni...@torproject.org Date: Tue Mar 10 08:39:20 2015 -0400 Whoops; I somehow dropped 9321 from the changelog --- ChangeLog |7 +++ 1 file changed, 7 insertions(+) diff --git a/ChangeLog b/ChangeLog index

[tor-commits] [tor/master] bump 0.2.6 to 0.2.6.4-rc-dev

2015-03-10 Thread nickm
commit 99b59dee7046b04854ac263a1cf810dceb80df12 Author: Nick Mathewson ni...@torproject.org Date: Tue Mar 10 08:20:47 2015 -0400 bump 0.2.6 to 0.2.6.4-rc-dev --- configure.ac|2 +- contrib/win32build/tor-mingw.nsi.in |2 +- src/win32/orconfig.h

[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug15205_025' into maint-0.2.6

2015-03-10 Thread nickm
commit 1af67d7f72470cec1de5e2a75186edc3b3accfbe Merge: 7c9be64 24c031b Author: Nick Mathewson ni...@torproject.org Date: Mon Mar 9 19:47:12 2015 -0400 Merge remote-tracking branch 'public/bug15205_025' into maint-0.2.6 changes/bug15205|5 + src/common/compat.h | 12

[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.6'

2015-03-10 Thread nickm
commit bc6dcac353de0e30e7b47f77cd990b50af73e6ca Merge: e732ec2 99b59de Author: Nick Mathewson ni...@torproject.org Date: Tue Mar 10 08:37:08 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.6' ___ tor-commits mailing list

[tor-commits] [tor/master] Merge commit 'origin/maint-0.2.6^'

2015-03-10 Thread nickm
commit e732ec295db714d84cc419be69764b10a302b633 Merge: 59f4c41 1af67d7 Author: Nick Mathewson ni...@torproject.org Date: Tue Mar 10 08:36:53 2015 -0400 Merge commit 'origin/maint-0.2.6^' changes/bug15205|5 + src/common/compat.h | 12 2 files changed, 17

[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.6'

2015-03-10 Thread nickm
commit 189f357f9790c30e443c6b88ea28eeafbd12abeb Merge: 28b4ab7 985687b Author: Nick Mathewson ni...@torproject.org Date: Tue Mar 10 10:10:44 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.6' ___ tor-commits mailing list

[tor-commits] [tor/master] Don't use checked strl{cat, cpy} on OSX.

2015-03-10 Thread nickm
commit 24c031b1a28658c921a746f4d58f3ca5e9994108 Author: Nick Mathewson ni...@torproject.org Date: Mon Mar 9 15:09:49 2015 -0400 Don't use checked strl{cat,cpy} on OSX. There is a bug in the overlap-checking in strlcat that can crash Tor servers. Fixes bug 15205; this is an OSX

[tor-commits] [tor/maint-0.2.6] bump 0.2.6 to 0.2.6.4-rc-dev

2015-03-10 Thread nickm
commit 99b59dee7046b04854ac263a1cf810dceb80df12 Author: Nick Mathewson ni...@torproject.org Date: Tue Mar 10 08:20:47 2015 -0400 bump 0.2.6 to 0.2.6.4-rc-dev --- configure.ac|2 +- contrib/win32build/tor-mingw.nsi.in |2 +- src/win32/orconfig.h

[tor-commits] [tor/release-0.2.6] Merge branch 'maint-0.2.6' into release-0.2.6

2015-03-10 Thread nickm
commit 74f861b295fc59ae2567b5ec78e2a46d66e44630 Merge: 0c2e4ae 99b59de Author: Nick Mathewson ni...@torproject.org Date: Tue Mar 10 08:21:53 2015 -0400 Merge branch 'maint-0.2.6' into release-0.2.6 Conflicts: configure.ac contrib/win32build/tor-mingw.nsi.in

[tor-commits] [tor/release-0.2.6] bump 0.2.6 to 0.2.6.4-rc-dev

2015-03-10 Thread nickm
commit 99b59dee7046b04854ac263a1cf810dceb80df12 Author: Nick Mathewson ni...@torproject.org Date: Tue Mar 10 08:20:47 2015 -0400 bump 0.2.6 to 0.2.6.4-rc-dev --- configure.ac|2 +- contrib/win32build/tor-mingw.nsi.in |2 +- src/win32/orconfig.h

[tor-commits] [tor/maint-0.2.6] Fix check-spaces

2015-03-10 Thread nickm
commit 985687bc4f99b90ed88ccdbefc820260c299ff23 Author: Nick Mathewson ni...@torproject.org Date: Tue Mar 10 10:10:35 2015 -0400 Fix check-spaces --- src/common/container.h |1 - src/test/test_status.c |6 -- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git

[tor-commits] [tor/master] Fix check-spaces

2015-03-10 Thread nickm
commit 985687bc4f99b90ed88ccdbefc820260c299ff23 Author: Nick Mathewson ni...@torproject.org Date: Tue Mar 10 10:10:35 2015 -0400 Fix check-spaces --- src/common/container.h |1 - src/test/test_status.c |6 -- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git

[tor-commits] [tor/master] forward-port the 0.2.6.4-0rc changelog

2015-03-10 Thread nickm
commit 87993072ee4cb09ae6ef53a4f57d5374e2f508d0 Author: Nick Mathewson ni...@torproject.org Date: Tue Mar 10 08:40:13 2015 -0400 forward-port the 0.2.6.4-0rc changelog --- ChangeLog | 87 - 1 file changed, 86 insertions(+), 1

[tor-commits] [tor/master] Whoops; I somehow dropped 9321 from the changelog

2015-03-10 Thread nickm
commit 86d4704483ada4c9961051e82f36df17d4dfb768 Author: Nick Mathewson ni...@torproject.org Date: Tue Mar 10 08:39:20 2015 -0400 Whoops; I somehow dropped 9321 from the changelog --- ChangeLog |7 +++ 1 file changed, 7 insertions(+) diff --git a/ChangeLog b/ChangeLog index

[tor-commits] [tor/master] Remove the changes files from master (0.2.7) that already got merged into changelogs for 0.2.6.4-rc or earlier.

2015-03-10 Thread nickm
commit bd00c152bb6dbf0c86a66f6274a2e2c7e04b6702 Author: Nick Mathewson ni...@torproject.org Date: Tue Mar 10 08:45:26 2015 -0400 Remove the changes files from master (0.2.7) that already got merged into changelogs for 0.2.6.4-rc or earlier. --- changes/15188|3 ---

[tor-commits] [tor/master] Remove one changes files from master (0.2.7) that already got merged into changelogs for 0.2.6.4-rc

2015-03-10 Thread nickm
commit 28b4ab784ddee8e67afcce4bfd712fda6f9f4092 Author: Nick Mathewson ni...@torproject.org Date: Tue Mar 10 08:46:21 2015 -0400 Remove one changes files from master (0.2.7) that already got merged into changelogs for 0.2.6.4-rc --- changes/bug15033 |4 1 file changed, 4

[tor-commits] [translation/tails-persistence-setup_completed] Update translations for tails-persistence-setup_completed

2015-03-10 Thread translation
commit 5b455ba23ce15a72e041665f62026d7acc387dba Author: Translation commit bot translat...@torproject.org Date: Tue Mar 10 17:45:24 2015 + Update translations for tails-persistence-setup_completed --- es/es.po |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git

[tor-commits] [translation/tails-persistence-setup] Update translations for tails-persistence-setup

2015-03-10 Thread translation
commit 59e345b007950210f9727aca42eadf96493022b1 Author: Translation commit bot translat...@torproject.org Date: Tue Mar 10 17:45:19 2015 + Update translations for tails-persistence-setup --- es/es.po |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/es/es.po

[tor-commits] [translation/tails-persistence-setup_completed] Update translations for tails-persistence-setup_completed

2015-03-10 Thread translation
commit 08f4400546f3783d218d45dcec03230a27ef176d Author: Translation commit bot translat...@torproject.org Date: Tue Mar 10 15:15:30 2015 + Update translations for tails-persistence-setup_completed --- es/es.po | 13 +++-- 1 file changed, 7 insertions(+), 6 deletions(-) diff

[tor-commits] [tor-messenger-build/master] Update the XMPP patches

2015-03-10 Thread sukhbir
commit d8c9f5ec184065ca9aafe41c041303dcc918aef1 Author: Sukhbir Singh sukh...@torproject.org Date: Tue Mar 10 20:57:19 2015 +0530 Update the XMPP patches Merge all XMPP patches into a single patch and set the default Jabber domain to jabber.ccc.de. ---

[tor-commits] [translation/liveusb-creator_completed] Update translations for liveusb-creator_completed

2015-03-10 Thread translation
commit 1ba79327be3c438b84b24849725b464e33c99bf1 Author: Translation commit bot translat...@torproject.org Date: Tue Mar 10 15:15:22 2015 + Update translations for liveusb-creator_completed --- es/es.po |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git

[tor-commits] [translation/tails-persistence-setup] Update translations for tails-persistence-setup

2015-03-10 Thread translation
commit 8680a22386488d5fa5746cbfd7ac0b2c0e614227 Author: Translation commit bot translat...@torproject.org Date: Tue Mar 10 15:15:26 2015 + Update translations for tails-persistence-setup --- es/es.po | 13 +++-- 1 file changed, 7 insertions(+), 6 deletions(-) diff --git

[tor-commits] [translation/tails-greeter_completed] Update translations for tails-greeter_completed

2015-03-10 Thread translation
commit b82361fff2b164ffc2baa9d9c9851e7d589d123c Author: Translation commit bot translat...@torproject.org Date: Tue Mar 10 15:15:38 2015 + Update translations for tails-greeter_completed --- es/es.po |8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git

[tor-commits] [translation/liveusb-creator] Update translations for liveusb-creator

2015-03-10 Thread translation
commit 1f58afb6fcfb9a36f73121b653fb3eaa262f13ca Author: Translation commit bot translat...@torproject.org Date: Tue Mar 10 15:15:18 2015 + Update translations for liveusb-creator --- es/es.po |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/es/es.po

[tor-commits] [stem/master] Python3 support for hidden service descriptor decryption

2015-03-10 Thread atagar
commit 378bfaf32c2eda1e22d92c6b2bce67f973af25da Author: Damian Johnson ata...@torproject.org Date: Tue Mar 10 09:10:50 2015 -0700 Python3 support for hidden service descriptor decryption Didn't have pycrypto for python3 so this test was being skipped for me. There were two

[tor-commits] [translation/tails-persistence-setup] Update translations for tails-persistence-setup

2015-03-10 Thread translation
commit 7bc9a590675e1754c7f69869da4a32819d6f562a Author: Translation commit bot translat...@torproject.org Date: Tue Mar 10 15:45:19 2015 + Update translations for tails-persistence-setup --- es/es.po |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/es/es.po

[tor-commits] [tor/release-0.2.6] Start on 0.2.6 release notes

2015-03-10 Thread nickm
commit 0f0b83815f5ecd22492f7b4b956c4d88a2b98e06 Author: Nick Mathewson ni...@torproject.org Date: Tue Mar 10 10:59:13 2015 -0400 Start on 0.2.6 release notes I made these mostly mechanically, by collating all the 0.2.6.x changelogs and removing all the items that were bugfixes

[tor-commits] [translation/tails-greeter] Update translations for tails-greeter

2015-03-10 Thread translation
commit 5d395d6b860a02a8776b4451d8cf158bdab7991c Author: Translation commit bot translat...@torproject.org Date: Tue Mar 10 15:15:34 2015 + Update translations for tails-greeter --- es/es.po |8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/es/es.po

[tor-commits] [metrics-web/master] Add 0.2.6 and 0.2.7 to known versions.

2015-03-10 Thread karsten
commit a7fca984f8e5657583b7591c01a6b31c96c3e812 Author: Karsten Loesing karsten.loes...@gmx.net Date: Tue Mar 10 21:59:51 2015 +0100 Add 0.2.6 and 0.2.7 to known versions. Reported by qwerty1, resolves #15216. --- website/rserve/graphs.R |2 +- 1 file changed, 1 insertion(+),

[tor-commits] [translation/tails-persistence-setup_completed] Update translations for tails-persistence-setup_completed

2015-03-10 Thread translation
commit 84946412fc6fae99e971b4f0c71f091325156d2f Author: Translation commit bot translat...@torproject.org Date: Tue Mar 10 18:45:24 2015 + Update translations for tails-persistence-setup_completed --- es/es.po |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

[tor-commits] [translation/tails-persistence-setup] Update translations for tails-persistence-setup

2015-03-10 Thread translation
commit 3c8c7caa1b858ab6ead0207fa9eec2afcffedbe3 Author: Translation commit bot translat...@torproject.org Date: Tue Mar 10 18:45:19 2015 + Update translations for tails-persistence-setup --- es/es.po |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/es/es.po