[tor-commits] [translation/whisperback] Update translations for whisperback

2017-10-24 Thread translation
commit 5ba75a1d9976a6c77c34b7fe1a1c7291a3aa4cec Author: Translation commit bot Date: Wed Oct 25 03:45:25 2017 + Update translations for whisperback --- tg/tg.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tg/tg.po b/tg/tg.po

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

2017-10-24 Thread translation
commit de9ea15ceb51625fb2cce197abd35d4945dc7536 Author: Translation commit bot Date: Wed Oct 25 03:15:56 2017 + Update translations for liveusb-creator --- zh_CN/zh_CN.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zh_CN/zh_CN.po

[tor-commits] [translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd

2017-10-24 Thread translation
commit 779536e9c16cae553c21879b7adfcadf87e71b12 Author: Translation commit bot Date: Wed Oct 25 02:47:48 2017 + Update translations for torbutton-torbuttondtd --- zh_CN/torbutton.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

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

2017-10-24 Thread translation
commit 807dcf6de5e99dca46aafa4d9f58653522d6f090 Author: Translation commit bot Date: Wed Oct 25 02:45:54 2017 + Update translations for liveusb-creator --- zh_CN/zh_CN.po | 19 ++- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git

[tor-commits] [orbot/master] update Makefile for tor compression options

2017-10-24 Thread n8fr8
commit 90975fb18a61df16b2ee8cf39d40d3fa9455db16 Author: n8fr8 Date: Fri Oct 20 00:14:57 2017 -0400 update Makefile for tor compression options --- external/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/external/Makefile

[tor-commits] [orbot/master] update tor constants to 0.3.1.7-openssl1.0.2k

2017-10-24 Thread n8fr8
commit e6003f670f42a0a59d21b53bd407706c1f2737c1 Author: n8fr8 Date: Fri Oct 20 00:21:33 2017 -0400 update tor constants to 0.3.1.7-openssl1.0.2k --- .../main/java/org/torproject/android/service/TorServiceConstants.java | 4 +++- 1 file changed, 3 insertions(+), 1

[tor-commits] [orbot/master] remove unused permission

2017-10-24 Thread n8fr8
commit f09508def5774f15ade4c30a6652a1437f2d613e Author: n8fr8 Date: Tue Oct 24 22:16:01 2017 -0400 remove unused permission --- app/src/fullperm/AndroidManifest.xml | 9 + app/src/main/AndroidManifest.xml | 8 2 files changed, 1 insertion(+), 16

[tor-commits] [orbot/master] update main activity to clean up intents

2017-10-24 Thread n8fr8
commit 1e2074c818673ef8eccf0017984fdcb16d6ea82e Author: n8fr8 Date: Mon Oct 16 23:37:15 2017 -0400 update main activity to clean up intents --- .../java/org/torproject/android/OrbotMainActivity.java | 17 + 1 file changed, 1 insertion(+), 16

[tor-commits] [orbot/master] remove xtables and iptables (no more root support)

2017-10-24 Thread n8fr8
commit 25425a622ee96a2300504c78e3af35f72747f49d Author: n8fr8 Date: Tue Oct 17 10:07:54 2017 -0400 remove xtables and iptables (no more root support) --- external/Makefile | 44 ++-- 1 file changed, 2 insertions(+), 42

[tor-commits] [orbot/master] update version to 15.4.4-BETA-1

2017-10-24 Thread n8fr8
commit d86ace63da4a990dc3e8201b25cb565120f31cb1 Author: n8fr8 Date: Fri Oct 20 00:15:24 2017 -0400 update version to 15.4.4-BETA-1 update gradle depends --- app/build.gradle | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git

[tor-commits] [orbot/master] update to latest meek amazon bridge:

2017-10-24 Thread n8fr8
commit 2bd5614210ac37e1316e3dfaec3cc215abc98b9a Author: n8fr8 Date: Mon Oct 16 23:35:41 2017 -0400 update to latest meek amazon bridge: https://trac.torproject.org/projects/tor/ticket/21918 --- orbotservice/src/main/assets/bridges.txt | 4 ++-- 1 file changed, 2

[tor-commits] [orbot/master] make sure receiver unregisters when destroyed

2017-10-24 Thread n8fr8
commit b322e530da659d714dc28679b158c3ed8fee8d7b Author: n8fr8 Date: Mon Oct 16 23:36:14 2017 -0400 make sure receiver unregisters when destroyed --- .../java/org/torproject/android/service/TorService.java | 16 +--- 1 file changed, 9 insertions(+), 7

[tor-commits] [orbot/master] simplify bridge selection screen

2017-10-24 Thread n8fr8
commit b98a0ff160d55d5f218031aa501d109d238b188c Author: n8fr8 Date: Mon Oct 16 23:48:45 2017 -0400 simplify bridge selection screen --- app/src/main/java/org/torproject/android/OrbotMainActivity.java | 7 +-- app/src/main/res/values-es/arrays.xml

[tor-commits] [orbot/master] update about layout to show obfs4proxy

2017-10-24 Thread n8fr8
commit a5015dc691cfe4a07c4f583ab4bb439d8ce2ec05 Author: n8fr8 Date: Mon Oct 16 23:36:47 2017 -0400 update about layout to show obfs4proxy --- app/src/main/res/layout/layout_about.xml | 2 +- app/src/main/res/values/strings.xml | 2 +- 2 files changed, 2

[tor-commits] [orbot/master] tor-0.3.1.7 update

2017-10-24 Thread n8fr8
commit b0b6b68c841b416bec84c6a000ffe2cda13f9735 Author: n8fr8 Date: Tue Oct 17 09:59:18 2017 -0400 tor-0.3.1.7 update --- external/tor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/tor b/external/tor index 802d30d9..6babd3d9 16 ---

[tor-commits] [orbot/master] update version 15430000 aka 15.4.3-RC-1-multi-SDK16

2017-10-24 Thread n8fr8
commit dceea1178231b1136693b0de69fdb1c3f46c6a64 Author: n8fr8 Date: Mon Oct 16 23:49:03 2017 -0400 update version 1543 aka 15.4.3-RC-1-multi-SDK16 --- app/build.gradle | 13 - 1 file changed, 4 insertions(+), 9 deletions(-) diff --git

[tor-commits] [tor/master] Merge branch 'maint-0.3.2'

2017-10-24 Thread nickm
commit e5c341eb7c1189985d903f708ce91516da7f0c76 Merge: 349818380 e7126a103 Author: Nick Mathewson Date: Tue Oct 24 19:43:13 2017 -0400 Merge branch 'maint-0.3.2' changes/bug20532 | 4 src/or/bridges.c | 8 2 files changed, 12 insertions(+)

[tor-commits] [tor/release-0.3.2] Rewrite bridge addresses earlier

2017-10-24 Thread nickm
commit 9b60acd4d4ee451fd961b1f03ae46eee960c72ee Author: Taylor Yu Date: Thu Sep 28 17:15:47 2017 -0500 Rewrite bridge addresses earlier Call rewrite_node_address_for_bridge() in launch_direct_bridge_descriptor_fetch() in case there's an existing

[tor-commits] [tor/maint-0.3.2] Rewrite bridge addresses earlier

2017-10-24 Thread nickm
commit 9b60acd4d4ee451fd961b1f03ae46eee960c72ee Author: Taylor Yu Date: Thu Sep 28 17:15:47 2017 -0500 Rewrite bridge addresses earlier Call rewrite_node_address_for_bridge() in launch_direct_bridge_descriptor_fetch() in case there's an existing

[tor-commits] [tor/master] Merge remote-tracking branch 'catalyst-oniongit/bug20532_031' into maint-0.3.2

2017-10-24 Thread nickm
commit e7126a1030233fd656cff4a8ee998026065fb65b Merge: b95ef19a7 9b60acd4d Author: Nick Mathewson Date: Tue Oct 24 19:41:26 2017 -0400 Merge remote-tracking branch 'catalyst-oniongit/bug20532_031' into maint-0.3.2 changes/bug20532 | 4 src/or/bridges.c | 8

[tor-commits] [tor/master] Turn a comment into a doxygen comment.

2017-10-24 Thread nickm
commit 3498183807fa626289aab98ed8b2477176a70190 Author: Nick Mathewson Date: Tue Oct 24 19:42:18 2017 -0400 Turn a comment into a doxygen comment. Crediting this * to teor, in penance for mis-crediting his x removal to Isis. The balance is restored. ---

[tor-commits] [tor/master] Rewrite bridge addresses earlier

2017-10-24 Thread nickm
commit 9b60acd4d4ee451fd961b1f03ae46eee960c72ee Author: Taylor Yu Date: Thu Sep 28 17:15:47 2017 -0500 Rewrite bridge addresses earlier Call rewrite_node_address_for_bridge() in launch_direct_bridge_descriptor_fetch() in case there's an existing

[tor-commits] [tor/maint-0.3.2] Merge remote-tracking branch 'catalyst-oniongit/bug20532_031' into maint-0.3.2

2017-10-24 Thread nickm
commit e7126a1030233fd656cff4a8ee998026065fb65b Merge: b95ef19a7 9b60acd4d Author: Nick Mathewson Date: Tue Oct 24 19:41:26 2017 -0400 Merge remote-tracking branch 'catalyst-oniongit/bug20532_031' into maint-0.3.2 changes/bug20532 | 4 src/or/bridges.c | 8

[tor-commits] [tor/release-0.3.2] Merge remote-tracking branch 'catalyst-oniongit/bug20532_031' into maint-0.3.2

2017-10-24 Thread nickm
commit e7126a1030233fd656cff4a8ee998026065fb65b Merge: b95ef19a7 9b60acd4d Author: Nick Mathewson Date: Tue Oct 24 19:41:26 2017 -0400 Merge remote-tracking branch 'catalyst-oniongit/bug20532_031' into maint-0.3.2 changes/bug20532 | 4 src/or/bridges.c | 8

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

2017-10-24 Thread nickm
commit b95ef19a77e2e04c740bbbe16d3b0ed7a5239aee Merge: 594cf9249 f3af74ccf Author: Nick Mathewson Date: Tue Oct 24 19:35:32 2017 -0400 Merge branch 'feature18329_029_squashed' into maint-0.3.2 changes/feature18329 | 2 +- src/test/test_config.c | 18

[tor-commits] [tor/release-0.3.2] Updates to fix check-spaces/check-changes warnings

2017-10-24 Thread nickm
commit f3af74ccf594c07f7edbf0bdfa576b9af21563d9 Author: Nick Mathewson Date: Tue Oct 24 19:35:16 2017 -0400 Updates to fix check-spaces/check-changes warnings --- changes/feature18329 | 2 +- src/or/config.c| 1 - src/test/test_config.c | 12

[tor-commits] [tor/release-0.3.2] doc: Improve documentation for check_bridge_distribution_setting().

2017-10-24 Thread nickm
commit b0e10f23ba2b03f275ef4acf2183a02042e6cded Author: Isis Lovecruft Date: Mon Oct 23 19:37:52 2017 + doc: Improve documentation for check_bridge_distribution_setting(). --- src/or/config.c | 22 -- 1 file changed, 20 insertions(+), 2

[tor-commits] [tor/master] Merge branch 'feature18329_029_squashed' into maint-0.3.2

2017-10-24 Thread nickm
commit b95ef19a77e2e04c740bbbe16d3b0ed7a5239aee Merge: 594cf9249 f3af74ccf Author: Nick Mathewson Date: Tue Oct 24 19:35:32 2017 -0400 Merge branch 'feature18329_029_squashed' into maint-0.3.2 changes/feature18329 | 2 +- src/test/test_config.c | 18

[tor-commits] [tor/release-0.3.2] Add new BridgeDistribution config option

2017-10-24 Thread nickm
commit ebab5215252f9fa810ae091c335c5ae6e619faaf Author: Roger Dingledine Date: Sun Nov 13 02:39:16 2016 -0500 Add new BridgeDistribution config option Bridge relays can use it to add a "bridge-distribution-request" line to their bridge descriptor, which

[tor-commits] [tor/release-0.3.2] Adjust test to allow hyphens too.

2017-10-24 Thread nickm
commit 44e8aaa9aa57bf6b9fce1712a8f77e5f9979392c Author: Nick Mathewson Date: Tue Oct 24 19:33:38 2017 -0400 Adjust test to allow hyphens too. --- src/test/test_config.c | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/test/test_config.c

[tor-commits] [tor/master] Adjust test to allow hyphens too.

2017-10-24 Thread nickm
commit 44e8aaa9aa57bf6b9fce1712a8f77e5f9979392c Author: Nick Mathewson Date: Tue Oct 24 19:33:38 2017 -0400 Adjust test to allow hyphens too. --- src/test/test_config.c | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/test/test_config.c

[tor-commits] [tor/release-0.3.2] Always set bridge-distribution-request on bridges' descriptors.

2017-10-24 Thread nickm
commit 613b18f0afd865b0fc5daf8d17da241396100dcd Author: Nick Mathewson Date: Mon Oct 23 10:52:42 2017 -0400 Always set bridge-distribution-request on bridges' descriptors. Also, warn the user if the BridgeDistribution option is unrecognized, and reject

[tor-commits] [tor/release-0.3.2] Tweak the documentation for BridgeDistribution

2017-10-24 Thread nickm
commit 3581f93d273dfd9fbc56de907b7e3b77575614e1 Author: Nick Mathewson Date: Mon Oct 23 10:38:19 2017 -0400 Tweak the documentation for BridgeDistribution Note that it will have no effect yet; note that the default is "any". --- changes/feature18329 | 5

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

2017-10-24 Thread nickm
commit 594cf92498c8ea12dc0b19f743d6b88d4a98f1eb Merge: 122a7f884 02cde0d93 Author: Nick Mathewson Date: Tue Oct 24 19:35:28 2017 -0400 Merge branch 'feature18329_029_squashed' into maint-0.3.2 changes/feature18329 | 9 doc/tor.1.txt | 11 +

[tor-commits] [tor/release-0.3.2] test: Add unittest for descriptors with BridgeDistribution option.

2017-10-24 Thread nickm
commit 02cde0d9398c43de3a67133b7982d9df6962fe32 Author: Isis Lovecruft Date: Mon Oct 23 19:44:06 2017 + test: Add unittest for descriptors with BridgeDistribution option. --- src/or/config.c| 3 +- src/or/config.h| 1 + src/test/include.am|

[tor-commits] [tor/master] Isis has been noticing typos.

2017-10-24 Thread nickm
commit 8cc57bccfe9acd3d64ef30349c3727586e253bb3 Author: Nick Mathewson Date: Tue Oct 24 19:37:09 2017 -0400 Isis has been noticing typos. --- src/or/or.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/or/or.h b/src/or/or.h index

[tor-commits] [tor/master] test: Add unittest for descriptors with BridgeDistribution option.

2017-10-24 Thread nickm
commit 02cde0d9398c43de3a67133b7982d9df6962fe32 Author: Isis Lovecruft Date: Mon Oct 23 19:44:06 2017 + test: Add unittest for descriptors with BridgeDistribution option. --- src/or/config.c| 3 +- src/or/config.h| 1 + src/test/include.am|

[tor-commits] [tor/master] Merge branch 'feature18329_029_squashed' into maint-0.3.2

2017-10-24 Thread nickm
commit 594cf92498c8ea12dc0b19f743d6b88d4a98f1eb Merge: 122a7f884 02cde0d93 Author: Nick Mathewson Date: Tue Oct 24 19:35:28 2017 -0400 Merge branch 'feature18329_029_squashed' into maint-0.3.2 changes/feature18329 | 9 doc/tor.1.txt | 11 +

[tor-commits] [tor/master] Tweak the documentation for BridgeDistribution

2017-10-24 Thread nickm
commit 3581f93d273dfd9fbc56de907b7e3b77575614e1 Author: Nick Mathewson Date: Mon Oct 23 10:38:19 2017 -0400 Tweak the documentation for BridgeDistribution Note that it will have no effect yet; note that the default is "any". --- changes/feature18329 | 5

[tor-commits] [tor/master] Add new BridgeDistribution config option

2017-10-24 Thread nickm
commit ebab5215252f9fa810ae091c335c5ae6e619faaf Author: Roger Dingledine Date: Sun Nov 13 02:39:16 2016 -0500 Add new BridgeDistribution config option Bridge relays can use it to add a "bridge-distribution-request" line to their bridge descriptor, which

[tor-commits] [tor/master] Updates to fix check-spaces/check-changes warnings

2017-10-24 Thread nickm
commit f3af74ccf594c07f7edbf0bdfa576b9af21563d9 Author: Nick Mathewson Date: Tue Oct 24 19:35:16 2017 -0400 Updates to fix check-spaces/check-changes warnings --- changes/feature18329 | 2 +- src/or/config.c| 1 - src/test/test_config.c | 12

[tor-commits] [tor/master] doc: Improve documentation for check_bridge_distribution_setting().

2017-10-24 Thread nickm
commit b0e10f23ba2b03f275ef4acf2183a02042e6cded Author: Isis Lovecruft Date: Mon Oct 23 19:37:52 2017 + doc: Improve documentation for check_bridge_distribution_setting(). --- src/or/config.c | 22 -- 1 file changed, 20 insertions(+), 2

[tor-commits] [tor/master] Merge branch 'maint-0.3.2'

2017-10-24 Thread nickm
commit 8d908b961fc90628c449b344f5181eeec3e3bd70 Merge: 8cc57bccf b95ef19a7 Author: Nick Mathewson Date: Tue Oct 24 19:37:11 2017 -0400 Merge branch 'maint-0.3.2' changes/feature18329 | 9 doc/tor.1.txt | 11 + src/or/config.c| 62

[tor-commits] [tor/master] Always set bridge-distribution-request on bridges' descriptors.

2017-10-24 Thread nickm
commit 613b18f0afd865b0fc5daf8d17da241396100dcd Author: Nick Mathewson Date: Mon Oct 23 10:52:42 2017 -0400 Always set bridge-distribution-request on bridges' descriptors. Also, warn the user if the BridgeDistribution option is unrecognized, and reject

[tor-commits] [tor/maint-0.3.2] Merge branch 'feature18329_029_squashed' into maint-0.3.2

2017-10-24 Thread nickm
commit b95ef19a77e2e04c740bbbe16d3b0ed7a5239aee Merge: 594cf9249 f3af74ccf Author: Nick Mathewson Date: Tue Oct 24 19:35:32 2017 -0400 Merge branch 'feature18329_029_squashed' into maint-0.3.2 changes/feature18329 | 2 +- src/test/test_config.c | 18

[tor-commits] [tor/maint-0.3.2] Merge branch 'feature18329_029_squashed' into maint-0.3.2

2017-10-24 Thread nickm
commit 594cf92498c8ea12dc0b19f743d6b88d4a98f1eb Merge: 122a7f884 02cde0d93 Author: Nick Mathewson Date: Tue Oct 24 19:35:28 2017 -0400 Merge branch 'feature18329_029_squashed' into maint-0.3.2 changes/feature18329 | 9 doc/tor.1.txt | 11 +

[tor-commits] [tor/maint-0.3.2] Adjust test to allow hyphens too.

2017-10-24 Thread nickm
commit 44e8aaa9aa57bf6b9fce1712a8f77e5f9979392c Author: Nick Mathewson Date: Tue Oct 24 19:33:38 2017 -0400 Adjust test to allow hyphens too. --- src/test/test_config.c | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/test/test_config.c

[tor-commits] [tor/maint-0.3.2] Always set bridge-distribution-request on bridges' descriptors.

2017-10-24 Thread nickm
commit 613b18f0afd865b0fc5daf8d17da241396100dcd Author: Nick Mathewson Date: Mon Oct 23 10:52:42 2017 -0400 Always set bridge-distribution-request on bridges' descriptors. Also, warn the user if the BridgeDistribution option is unrecognized, and reject

[tor-commits] [tor/maint-0.3.2] Updates to fix check-spaces/check-changes warnings

2017-10-24 Thread nickm
commit f3af74ccf594c07f7edbf0bdfa576b9af21563d9 Author: Nick Mathewson Date: Tue Oct 24 19:35:16 2017 -0400 Updates to fix check-spaces/check-changes warnings --- changes/feature18329 | 2 +- src/or/config.c| 1 - src/test/test_config.c | 12

[tor-commits] [tor/maint-0.3.2] doc: Improve documentation for check_bridge_distribution_setting().

2017-10-24 Thread nickm
commit b0e10f23ba2b03f275ef4acf2183a02042e6cded Author: Isis Lovecruft Date: Mon Oct 23 19:37:52 2017 + doc: Improve documentation for check_bridge_distribution_setting(). --- src/or/config.c | 22 -- 1 file changed, 20 insertions(+), 2

[tor-commits] [tor/maint-0.3.2] Tweak the documentation for BridgeDistribution

2017-10-24 Thread nickm
commit 3581f93d273dfd9fbc56de907b7e3b77575614e1 Author: Nick Mathewson Date: Mon Oct 23 10:38:19 2017 -0400 Tweak the documentation for BridgeDistribution Note that it will have no effect yet; note that the default is "any". --- changes/feature18329 | 5

[tor-commits] [tor/maint-0.3.2] Add new BridgeDistribution config option

2017-10-24 Thread nickm
commit ebab5215252f9fa810ae091c335c5ae6e619faaf Author: Roger Dingledine Date: Sun Nov 13 02:39:16 2016 -0500 Add new BridgeDistribution config option Bridge relays can use it to add a "bridge-distribution-request" line to their bridge descriptor, which

[tor-commits] [tor/maint-0.3.2] test: Add unittest for descriptors with BridgeDistribution option.

2017-10-24 Thread nickm
commit 02cde0d9398c43de3a67133b7982d9df6962fe32 Author: Isis Lovecruft Date: Mon Oct 23 19:44:06 2017 + test: Add unittest for descriptors with BridgeDistribution option. --- src/or/config.c| 3 +- src/or/config.h| 1 + src/test/include.am|

[tor-commits] [nyx/master] Fix unit tests

2017-10-24 Thread atagar
commit c6c16ebc42908f56d064711492da6787c946c493 Author: Damian Johnson Date: Tue Oct 24 10:17:43 2017 -0700 Fix unit tests Lots of breakages have slipped in while attempting to improve our performance. Most were timing related due to our switch to

[tor-commits] [tor/master] Repair "make check"

2017-10-24 Thread nickm
commit f709dce414b8a8ebe95026a9e3fa763acdb17aff Author: Nick Mathewson Date: Tue Oct 24 12:54:21 2017 -0400 Repair "make check" --- changes/ticket23637 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changes/ticket23637 b/changes/ticket23637 index

[tor-commits] [tor/master] Assign Exit flag only for ports 80 and 443

2017-10-24 Thread nickm
commit 8dff23eb34cf63278f8c78eb965c77fe215b860c Author: Roger Dingledine Date: Sun Sep 24 19:27:07 2017 -0400 Assign Exit flag only for ports 80 and 443 Make the "Exit" flag assignment only depend on whether the exit policy allows connections to ports 80

[tor-commits] [tor/master] Merge remote-tracking branch 'arma/ticket23637'

2017-10-24 Thread nickm
commit 649000662d3b5f7000c9a4b06444f154e3b0628d Merge: 350fecfaf 8dff23eb3 Author: Nick Mathewson Date: Tue Oct 24 12:52:41 2017 -0400 Merge remote-tracking branch 'arma/ticket23637' changes/ticket23637 | 5 + src/or/policies.c | 13 - 2 files

[tor-commits] [torspec/master] assign Exit flag differently (from ticket 23637)

2017-10-24 Thread nickm
commit 4bc533ed4c49d7bedaec7ef272d8cb481eb5bc92 Author: Roger Dingledine Date: Sun Sep 24 19:36:16 2017 -0400 assign Exit flag differently (from ticket 23637) --- dir-spec.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dir-spec.txt

[tor-commits] [torspec/master] Merge remote-tracking branch 'arma/ticket23637-spec'

2017-10-24 Thread nickm
commit 42065cfb2925f3f0eb4a5b190feef2210228b44b Merge: c912116 4bc533e Author: Nick Mathewson Date: Tue Oct 24 12:53:16 2017 -0400 Merge remote-tracking branch 'arma/ticket23637-spec' dir-spec.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)

[tor-commits] [translation/https_everywhere_completed] Update translations for https_everywhere_completed

2017-10-24 Thread translation
commit 4b7ef9b79057057639759da3a0eef61168507f89 Author: Translation commit bot Date: Tue Oct 24 15:45:53 2017 + Update translations for https_everywhere_completed --- th/https-everywhere.dtd | 61 +++-- 1 file

[tor-commits] [translation/https_everywhere] Update translations for https_everywhere

2017-10-24 Thread translation
commit 71e15cdd7b6bbb2370035dce9b33551f55fcde9e Author: Translation commit bot Date: Tue Oct 24 15:45:41 2017 + Update translations for https_everywhere --- th/https-everywhere.dtd | 20 ++-- 1 file changed, 10 insertions(+), 10 deletions(-)

[tor-commits] [metrics-web/master] Add missing servlet and JSP for new Services page.

2017-10-24 Thread karsten
commit bc255c85113f1559e27d636c120a8f603988a8d9 Author: Karsten Loesing Date: Tue Oct 24 16:51:57 2017 +0200 Add missing servlet and JSP for new Services page. --- .../torproject/metrics/web/ServicesServlet.java| 30 +

[tor-commits] [metrics-web/master] Rename Operation section to Services.

2017-10-24 Thread karsten
commit a52850fc04bc3cd1de194691dd9280f78df4bf67 Author: Karsten Loesing Date: Tue Oct 24 16:47:32 2017 +0200 Rename Operation section to Services. Implements #23716. --- website/src/main/resources/etc/web.xml | 11 +

[tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.2.9' into maint-0.3.0

2017-10-24 Thread nickm
commit 302b5f577dc0840fd9f738d160ef14b88a71b67f Merge: d913a7317 725f23710 Author: Nick Mathewson Date: Tue Oct 24 09:10:24 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 "ours" merge to avoid version bump

[tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.2.9' into maint-0.3.0

2017-10-24 Thread nickm
commit 7bebd1b02551bb232fef73aa7f81c11ed6125a25 Merge: 5325e7cca 552b62028 Author: Nick Mathewson Date: Tue Oct 24 09:11:24 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 "ours" merge to avoid version bump

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

2017-10-24 Thread nickm
commit 4a49e134bc30ff1ab4693cffc9d88ad993758889 Merge: ee70e2ed6 990322fca Author: Nick Mathewson Date: Tue Oct 24 09:11:38 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 ___ tor-commits mailing list

[tor-commits] [tor/release-0.3.2] bump version in the other places :/

2017-10-24 Thread nickm
commit 552b620280d481ec9d5845d1c6584778545d1f85 Author: Nick Mathewson Date: Tue Oct 24 09:11:07 2017 -0400 bump version in the other places :/ --- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 2 files changed, 2

[tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.3.0' into maint-0.3.1

2017-10-24 Thread nickm
commit 38a58076e921d561fa1e488a4b0f983b12300ca4 Merge: cbb41ddfe 302b5f577 Author: Nick Mathewson Date: Tue Oct 24 09:10:30 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 "ours" merge to avoid version bump

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

2017-10-24 Thread nickm
commit cce1a6efa6adbb90566fc6567c82c4410cd76bf9 Merge: 0d4addfc7 38a58076e Author: Nick Mathewson Date: Tue Oct 24 09:10:37 2017 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 "ours" merge to avoid version bump

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

2017-10-24 Thread nickm
commit 122a7f8848785e3cefef812749c7ec1844b26402 Merge: cce1a6efa 990322fca Author: Nick Mathewson Date: Tue Oct 24 09:11:38 2017 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 ___ tor-commits mailing list

[tor-commits] [tor/release-0.3.2] bump version in the other places :/

2017-10-24 Thread nickm
commit 5325e7ccab70383a629019323ba01d2c9215b5f4 Author: Nick Mathewson Date: Tue Oct 24 09:11:17 2017 -0400 bump version in the other places :/ --- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 2 files changed, 2

[tor-commits] [tor/release-0.3.2] bump to 0.2.9.13

2017-10-24 Thread nickm
commit 09d2ae562ac47cfcb92ce5f66bb67ee3b5072059 Author: Nick Mathewson Date: Tue Oct 24 09:09:26 2017 -0400 bump to 0.2.9.13 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 76140cbd1..786b4b095

[tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.2.8' into maint-0.2.9

2017-10-24 Thread nickm
commit 725f2371042b36c151a42e575a5b319d3820126c Merge: 09d2ae562 912ebf165 Author: Nick Mathewson Date: Tue Oct 24 09:10:17 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 "ours" merge to avoid version bump

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

2017-10-24 Thread nickm
commit 990322fca450d2230067a3035468c5ac7168e760 Merge: 38a58076e 7bebd1b02 Author: Nick Mathewson Date: Tue Oct 24 09:11:33 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 "ours" merge to avoid version bump

[tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.2.5' into maint-0.2.8

2017-10-24 Thread nickm
commit 912ebf165f6a3e7385118cf78a4107f25b0ad5de Merge: d4befa035 743eee493 Author: Nick Mathewson Date: Tue Oct 24 09:10:04 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.8 "ours" merge to avoid version bump

[tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.3.0' into maint-0.3.1

2017-10-24 Thread nickm
commit 990322fca450d2230067a3035468c5ac7168e760 Merge: 38a58076e 7bebd1b02 Author: Nick Mathewson Date: Tue Oct 24 09:11:33 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 "ours" merge to avoid version bump

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

2017-10-24 Thread nickm
commit ee70e2ed6df64c10099350ec654dff65db21011c Merge: af51ac47e 38a58076e Author: Nick Mathewson Date: Tue Oct 24 09:10:42 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2

[tor-commits] [tor/release-0.3.2] bump to 0.2.8.16

2017-10-24 Thread nickm
commit d4befa035d5caa7a3c71b62cb3f613c36060c9e0 Author: Nick Mathewson Date: Tue Oct 24 09:09:10 2017 -0400 bump to 0.2.8.16 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 55ace93cb..79af3d4b6

[tor-commits] [tor/release-0.3.1] bump to 0.2.8.16

2017-10-24 Thread nickm
commit d4befa035d5caa7a3c71b62cb3f613c36060c9e0 Author: Nick Mathewson Date: Tue Oct 24 09:09:10 2017 -0400 bump to 0.2.8.16 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 55ace93cb..79af3d4b6

[tor-commits] [tor/release-0.3.1] bump version in the other places :/

2017-10-24 Thread nickm
commit 552b620280d481ec9d5845d1c6584778545d1f85 Author: Nick Mathewson Date: Tue Oct 24 09:11:07 2017 -0400 bump version in the other places :/ --- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 2 files changed, 2

[tor-commits] [tor/release-0.3.2] bump to 0.3.0.12

2017-10-24 Thread nickm
commit d913a7317bf205d580cde70a0b58010295fe6c4c Author: Nick Mathewson Date: Tue Oct 24 09:09:35 2017 -0400 bump to 0.3.0.12 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 3f36da739..60d4cc784

[tor-commits] [tor/release-0.3.1] Merge branch 'maint-0.2.8' into maint-0.2.9

2017-10-24 Thread nickm
commit 725f2371042b36c151a42e575a5b319d3820126c Merge: 09d2ae562 912ebf165 Author: Nick Mathewson Date: Tue Oct 24 09:10:17 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 "ours" merge to avoid version bump

[tor-commits] [tor/release-0.3.2] bump to 0.3.1.8

2017-10-24 Thread nickm
commit cbb41ddfef3398e2aefef952b491610864f9670d Author: Nick Mathewson Date: Tue Oct 24 09:09:50 2017 -0400 bump to 0.3.1.8 --- configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 3 files

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

2017-10-24 Thread nickm
commit 7e3d5312ede31d4fa66d260de8f5dedf8cf1 Merge: a574ab8e2 552b62028 Author: Nick Mathewson Date: Tue Oct 24 09:11:38 2017 -0400 Merge branch 'maint-0.2.9' into release-0.2.9 contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2

[tor-commits] [tor/release-0.3.1] bump to 0.2.5.15

2017-10-24 Thread nickm
commit 743eee4930e7f5e37e18cc0f81e86133ab62885f Author: Nick Mathewson Date: Tue Oct 24 09:09:00 2017 -0400 bump to 0.2.5.15 --- configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 3

[tor-commits] [tor/release-0.3.1] bump to 0.3.0.12

2017-10-24 Thread nickm
commit d913a7317bf205d580cde70a0b58010295fe6c4c Author: Nick Mathewson Date: Tue Oct 24 09:09:35 2017 -0400 bump to 0.3.0.12 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 3f36da739..60d4cc784

[tor-commits] [tor/release-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.0

2017-10-24 Thread nickm
commit 302b5f577dc0840fd9f738d160ef14b88a71b67f Merge: d913a7317 725f23710 Author: Nick Mathewson Date: Tue Oct 24 09:10:24 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 "ours" merge to avoid version bump

[tor-commits] [tor/release-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.0

2017-10-24 Thread nickm
commit 7bebd1b02551bb232fef73aa7f81c11ed6125a25 Merge: 5325e7cca 552b62028 Author: Nick Mathewson Date: Tue Oct 24 09:11:24 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 "ours" merge to avoid version bump

[tor-commits] [tor/release-0.3.1] bump version in the other places :/

2017-10-24 Thread nickm
commit 5325e7ccab70383a629019323ba01d2c9215b5f4 Author: Nick Mathewson Date: Tue Oct 24 09:11:17 2017 -0400 bump version in the other places :/ --- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 2 files changed, 2

[tor-commits] [tor/release-0.3.2] bump to 0.2.5.15

2017-10-24 Thread nickm
commit 743eee4930e7f5e37e18cc0f81e86133ab62885f Author: Nick Mathewson Date: Tue Oct 24 09:09:00 2017 -0400 bump to 0.2.5.15 --- configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 3

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

2017-10-24 Thread nickm
commit 38a58076e921d561fa1e488a4b0f983b12300ca4 Merge: cbb41ddfe 302b5f577 Author: Nick Mathewson Date: Tue Oct 24 09:10:30 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 "ours" merge to avoid version bump

[tor-commits] [tor/release-0.3.1] bump to 0.2.9.13

2017-10-24 Thread nickm
commit 09d2ae562ac47cfcb92ce5f66bb67ee3b5072059 Author: Nick Mathewson Date: Tue Oct 24 09:09:26 2017 -0400 bump to 0.2.9.13 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 76140cbd1..786b4b095

[tor-commits] [tor/release-0.3.1] Merge branch 'maint-0.2.5' into maint-0.2.8

2017-10-24 Thread nickm
commit 912ebf165f6a3e7385118cf78a4107f25b0ad5de Merge: d4befa035 743eee493 Author: Nick Mathewson Date: Tue Oct 24 09:10:04 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.8 "ours" merge to avoid version bump

[tor-commits] [tor/release-0.3.1] bump to 0.3.1.8

2017-10-24 Thread nickm
commit cbb41ddfef3398e2aefef952b491610864f9670d Author: Nick Mathewson Date: Tue Oct 24 09:09:50 2017 -0400 bump to 0.3.1.8 --- configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 3 files

[tor-commits] [tor/release-0.3.0] bump to 0.2.8.16

2017-10-24 Thread nickm
commit d4befa035d5caa7a3c71b62cb3f613c36060c9e0 Author: Nick Mathewson Date: Tue Oct 24 09:09:10 2017 -0400 bump to 0.2.8.16 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 55ace93cb..79af3d4b6

[tor-commits] [tor/release-0.3.0] bump version in the other places :/

2017-10-24 Thread nickm
commit 552b620280d481ec9d5845d1c6584778545d1f85 Author: Nick Mathewson Date: Tue Oct 24 09:11:07 2017 -0400 bump version in the other places :/ --- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 2 files changed, 2

[tor-commits] [tor/release-0.2.9] bump version in the other places :/

2017-10-24 Thread nickm
commit 552b620280d481ec9d5845d1c6584778545d1f85 Author: Nick Mathewson Date: Tue Oct 24 09:11:07 2017 -0400 bump version in the other places :/ --- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 2 files changed, 2

[tor-commits] [tor/release-0.3.0] Merge branch 'maint-0.2.8' into maint-0.2.9

2017-10-24 Thread nickm
commit 725f2371042b36c151a42e575a5b319d3820126c Merge: 09d2ae562 912ebf165 Author: Nick Mathewson Date: Tue Oct 24 09:10:17 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 "ours" merge to avoid version bump

[tor-commits] [tor/release-0.3.0] bump to 0.2.9.13

2017-10-24 Thread nickm
commit 09d2ae562ac47cfcb92ce5f66bb67ee3b5072059 Author: Nick Mathewson Date: Tue Oct 24 09:09:26 2017 -0400 bump to 0.2.9.13 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 76140cbd1..786b4b095

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

2017-10-24 Thread nickm
commit 0ad7317107ce176bb2221f3d3128ec4b9c3e7bbc Merge: 2244838ec 302b5f577 Author: Nick Mathewson Date: Tue Oct 24 09:10:42 2017 -0400 Merge branch 'maint-0.3.0' into release-0.3.0 configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

  1   2   3   >