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

2018-06-17 Thread translation
commit 82b83a2ec1f9fbb12b2fdb0d5e2b3473158523cd Author: Translation commit bot Date: Sun Jun 17 09:45:36 2018 + Update translations for https_everywhere --- ca/https-everywhere.dtd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ca/https-everywhere.dtd

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

2018-06-17 Thread translation
commit 5ccb78e13830f229a349063ef70bc49ac1c92f61 Author: Translation commit bot Date: Sun Jun 17 10:15:46 2018 + Update translations for https_everywhere_completed --- ca/https-everywhere.dtd | 6 ++ ca/ssl-observatory.dtd | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-)

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

2018-06-17 Thread translation
commit 614d450a4f8e5a580216c1566404676adea7738f Author: Translation commit bot Date: Sun Jun 17 10:15:37 2018 + Update translations for https_everywhere --- ca/https-everywhere.dtd | 4 ++-- ca/ssl-observatory.dtd | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git

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

2018-06-17 Thread translation
commit 75ffe36984472d29e887a3a809d249be2655cb8c Author: Translation commit bot Date: Sun Jun 17 10:17:34 2018 + Update translations for torbutton-torbuttonproperties_completed --- ca/torbutton.properties | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ca/torbutton.properties

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

2018-06-17 Thread translation
commit a06eff2a99b8782a0815894d7f0389e2dbd864b7 Author: Translation commit bot Date: Sun Jun 17 10:17:40 2018 + Update translations for torbutton-torbuttondtd --- ca/torbutton.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ca/torbutton.dtd

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

2018-06-17 Thread translation
commit 77928c9973506cf2abb5d9f30b94292a1de6f4dd Author: Translation commit bot Date: Sun Jun 17 10:17:29 2018 + Update translations for torbutton-torbuttonproperties --- ca/torbutton.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git

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

2018-06-17 Thread translation
commit 8cdf515ab204a81aef6a6c2a0f6118d341642e9c Author: Translation commit bot Date: Sun Jun 17 10:17:59 2018 + Update translations for tails-perl5lib --- ca.po | 9 + 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/ca.po b/ca.po index 392f959c4..7ca0beec5 100644

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

2018-06-17 Thread translation
commit 29e35d5d0347738577b9b976edfe1f87178e5266 Author: Translation commit bot Date: Sun Jun 17 10:18:04 2018 + Update translations for tails-perl5lib_completed --- ca.po | 15 --- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/ca.po b/ca.po index

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

2018-06-17 Thread translation
commit 229fd21060212f324c9f79534a8f024a9df8d8c9 Author: Translation commit bot Date: Sun Jun 17 10:17:45 2018 + Update translations for torbutton-torbuttondtd_completed --- ca/torbutton.dtd | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ca/torbutton.dtd

[tor-commits] [translation/mat-gui_completed] Update translations for mat-gui_completed

2018-06-17 Thread translation
commit 431439a1773d1605bce57184e25f224be699b65a Author: Translation commit bot Date: Sun Jun 17 18:46:13 2018 + Update translations for mat-gui_completed --- ta.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ta.po b/ta.po index 987251c86..2240eff3e 100644

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

2018-06-17 Thread translation
commit cb441861f53680f689eddf39d2d05531d3edb13f Author: Translation commit bot Date: Sun Jun 17 18:15:59 2018 + Update translations for torbirdy --- ta/torbirdy.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ta/torbirdy.dtd b/ta/torbirdy.dtd index

[tor-commits] [translation/mat-gui] Update translations for mat-gui

2018-06-17 Thread translation
commit 36e0d70c494f7e8bd0292db3c6a3a9fd170599a8 Author: Translation commit bot Date: Sun Jun 17 18:46:08 2018 + Update translations for mat-gui --- ta.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ta.po b/ta.po index 987251c86..2240eff3e 100644 --- a/ta.po

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

2018-06-17 Thread translation
commit bdc2d2b9f29a655d1c534eaf399cd20f73dac7de Author: Translation commit bot Date: Sun Jun 17 18:48:33 2018 + Update translations for tails-greeter-2 --- ta/ta.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ta/ta.po b/ta/ta.po index 4e1e72bc4..d265dc755

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

2018-06-17 Thread translation
commit 6e12a35f81176e450dca6d4c5d0f2951f00d99c7 Author: Translation commit bot Date: Sun Jun 17 10:45:37 2018 + Update translations for https_everywhere --- eo/ssl-observatory.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eo/ssl-observatory.dtd

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

2018-06-17 Thread translation
commit 1f7854751161782ad306286e76d0094620474f1b Author: Translation commit bot Date: Sun Jun 17 10:45:46 2018 + Update translations for https_everywhere_completed --- eo/ssl-observatory.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eo/ssl-observatory.dtd

[tor-commits] [sandboxed-tor-browser/master] Make it clear the project is unmaintained. (No functional changes).

2018-06-17 Thread yawning
commit 8d0e19931cdb3d62c645ee8cdc99b6db488a63c4 Author: Yawning Angel Date: Sun Jun 17 13:16:24 2018 + Make it clear the project is unmaintained. (No functional changes). --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index f5013d0..9205de1

[tor-commits] [translation/support-connecting] Update translations for support-connecting

2018-06-17 Thread translation
commit 13716605aa1ac3cbd72fa6ea1aa69229c210e484 Author: Translation commit bot Date: Sun Jun 17 10:49:33 2018 + Update translations for support-connecting --- ca.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ca.json b/ca.json index af8c4aca9..68727e653

[tor-commits] [translation/support-miscellaneous] Update translations for support-miscellaneous

2018-06-17 Thread translation
commit bf831b14008c1619fb1b60a6ce2ce2de3c8716c4 Author: Translation commit bot Date: Sun Jun 17 15:49:33 2018 + Update translations for support-miscellaneous --- pt_BR.json | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pt_BR.json b/pt_BR.json index

[tor-commits] [translation/support-tbb] Update translations for support-tbb

2018-06-17 Thread translation
commit e5556871d4c2ad0ec3dcc6035aa661115162ec01 Author: Translation commit bot Date: Sun Jun 17 15:49:43 2018 + Update translations for support-tbb --- pt_BR.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pt_BR.json b/pt_BR.json index d08ce8d22..fcca9c526

[tor-commits] [translation/support-topics] Update translations for support-topics

2018-06-17 Thread translation
commit 4fc6f011d63a1319a65575719ed0092d53faafc8 Author: Translation commit bot Date: Sun Jun 17 15:49:52 2018 + Update translations for support-topics --- pt_BR.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pt_BR.json b/pt_BR.json index

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

2018-06-17 Thread translation
commit 0fd9972fec5c00d05a2a5bfed9c50420f238a093 Author: Translation commit bot Date: Sun Jun 17 14:15:34 2018 + Update translations for https_everywhere --- lt/ssl-observatory.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lt/ssl-observatory.dtd

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

2018-06-17 Thread translation
commit 0f9e0b32d2be1c90a6f1fa20b03fe33a21280bb9 Author: Translation commit bot Date: Sun Jun 17 14:15:43 2018 + Update translations for https_everywhere_completed --- lt/ssl-observatory.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lt/ssl-observatory.dtd

[tor-commits] [translation/support-tbb] Update translations for support-tbb

2018-06-17 Thread translation
commit 889e93e89589adcc31b93133ca4d552bec5619c2 Author: Translation commit bot Date: Sun Jun 17 16:20:03 2018 + Update translations for support-tbb --- pt_BR.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pt_BR.json b/pt_BR.json index fcca9c526..996dd8215

[tor-commits] [tor/master] Implement GETINFO md/all

2018-06-17 Thread nickm
commit 25341245ae53a5800757fbfad37f5623b807befc Author: rl1987 Date: Fri May 25 13:37:12 2018 +0200 Implement GETINFO md/all --- changes/feature8323| 3 ++ src/or/control.c | 23 ++ src/test/test_controller.c | 76

[tor-commits] [tor/master] Merge remote-tracking branch 'rl1987/feature8323_squashed2'

2018-06-17 Thread nickm
commit 5746e210b8d0dfc54447ca31d6b2ac55a13271cc Merge: d5e4b6983 25341245a Author: Nick Mathewson Date: Sun Jun 17 20:20:15 2018 -0400 Merge remote-tracking branch 'rl1987/feature8323_squashed2' changes/feature8323| 3 ++ src/or/control.c | 23 ++

[tor-commits] [torspec/master] New KeyValues in sbws are not mandatory

2018-06-17 Thread nickm
commit f6098f962542d8cfeb76dcde1367129fc9caccc5 Author: juga0 Date: Mon May 28 21:02:20 2018 + New KeyValues in sbws are not mandatory therefore replace Exactly once by Zero or one time --- bandwidth-file-spec.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

[tor-commits] [torspec/master] Add bw lines KeyValues counting failures

2018-06-17 Thread nickm
commit 161b66f49abeabad6e2c9d008ce51d54f904094e Author: juga0 Date: Sat May 26 20:09:36 2018 + Add bw lines KeyValues counting failures also, update sbws examples --- bandwidth-file-spec.txt | 25 +++-- 1 file changed, 23 insertions(+), 2 deletions(-)

[tor-commits] [torspec/master] Add forgotten error_misc

2018-06-17 Thread nickm
commit 9934884f017ed9b15ec1ef3e31ae262adf1c0bcf Author: juga0 Date: Mon May 28 21:03:43 2018 + Add forgotten error_misc --- bandwidth-file-spec.txt | 7 +++ 1 file changed, 7 insertions(+) diff --git a/bandwidth-file-spec.txt b/bandwidth-file-spec.txt index 7a82510..864fffc

[tor-commits] [torspec/master] Merge remote-tracking branch 'juga/ticket26200'

2018-06-17 Thread nickm
commit 4df184021b7c84cc47e2ed19a601b1e790b5b4fb Merge: 72bb3d3 ded4213 Author: Nick Mathewson Date: Sun Jun 17 20:44:03 2018 -0400 Merge remote-tracking branch 'juga/ticket26200' bandwidth-file-spec.txt | 32 ++-- 1 file changed, 30 insertions(+), 2

[tor-commits] [torspec/master] Fix syntax: measurements is plural

2018-06-17 Thread nickm
commit ded4213b174e4078010b7683f85098db1a430fd2 Author: juga0 Date: Mon May 28 21:05:24 2018 + Fix syntax: measurements is plural --- bandwidth-file-spec.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bandwidth-file-spec.txt b/bandwidth-file-spec.txt

[tor-commits] [torspec/master] Add a sentence about newlines at the end of MDs

2018-06-17 Thread nickm
commit 0434d8446caf95f98784dfe647688e91dfce30e8 Author: rl1987 Date: Fri Jun 8 12:19:07 2018 +0300 Add a sentence about newlines at the end of MDs --- control-spec.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/control-spec.txt b/control-spec.txt index e6986b4..6863470 100644 ---

[tor-commits] [torspec/master] Merge remote-tracking branch 'rl1987/getinfo_md_all'

2018-06-17 Thread nickm
commit 8cbf2b320251bb888041cf58128202d930141ccc Merge: 4ead6e1 0434d84 Author: Nick Mathewson Date: Sun Jun 17 19:37:37 2018 -0400 Merge remote-tracking branch 'rl1987/getinfo_md_all' control-spec.txt | 5 + 1 file changed, 5 insertions(+)

[tor-commits] [torspec/master] Document GETINFO md/all

2018-06-17 Thread nickm
commit b5396d5eff4a2a152fe7f16d046e9008a399d588 Author: rl1987 Date: Sat May 26 11:02:02 2018 +0200 Document GETINFO md/all --- control-spec.txt | 4 1 file changed, 4 insertions(+) diff --git a/control-spec.txt b/control-spec.txt index 72ceb15..e6986b4 100644 --- a/control-spec.txt

[tor-commits] [torspec/master] We now know what version will have md/all.

2018-06-17 Thread nickm
commit dc4e88d4cabb40425fd63ccd681160e22fb53a7d Author: Nick Mathewson Date: Sun Jun 17 20:16:33 2018 -0400 We now know what version will have md/all. --- control-spec.txt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/control-spec.txt b/control-spec.txt index

[tor-commits] [tor/master] Merge remote-tracking branch 'rl1987/bug25477'

2018-06-17 Thread nickm
commit 16dd2f7bb0df8c6d45d62e4d515089a3a566fd8e Merge: 5746e210b eb7a3fae0 Author: Nick Mathewson Date: Sun Jun 17 20:25:40 2018 -0400 Merge remote-tracking branch 'rl1987/bug25477' changes/bug25477 | 3 +++ src/or/rendcache.c | 4 +--- 2 files changed, 4 insertions(+), 3 deletions(-)

[tor-commits] [tor/master] Refrain from mentioning old bug in a warning

2018-06-17 Thread nickm
commit eb7a3fae08638e38e55014b293d347d500cf14fa Author: rl1987 Date: Wed May 30 19:44:20 2018 +0200 Refrain from mentioning old bug in a warning --- changes/bug25477 | 3 +++ src/or/rendcache.c | 4 +--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/changes/bug25477

[tor-commits] [torspec/master] add back in the version where md/all started

2018-06-17 Thread arma
commit 72bb3d3a92927e0b1aa63cdb4d2aa5211ea5bc55 Author: Roger Dingledine Date: Sun Jun 17 20:23:16 2018 -0400 add back in the version where md/all started accidentally removed in commit dc4e88d4ca --- control-spec.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff

[tor-commits] [tor/master] Merge remote-tracking branch 'ffmancera-1/bug24658-dh_stream'

2018-06-17 Thread nickm
commit 3640c63498399f85d44358b0d3cfd8a6d62325f4 Merge: 16dd2f7bb d38e7ddf5 Author: Nick Mathewson Date: Sun Jun 17 20:39:13 2018 -0400 Merge remote-tracking branch 'ffmancera-1/bug24658-dh_stream' src/common/crypto.c | 601 +--

[tor-commits] [tor/master] Include crypto_dh.h in order to solve dependency issues.

2018-06-17 Thread nickm
commit ffbf8673b55e0f05bd27e9aa34f45f758941f446 Author: Fernando Fernandez Mancera Date: Tue May 8 15:56:04 2018 +0200 Include crypto_dh.h in order to solve dependency issues. Included crypto_dh.h in some files in order to solve DH module dependency issues. Follows

[tor-commits] [tor/master] Make dh_param_* stuff static again.

2018-06-17 Thread nickm
commit 827b85e9070950c524546adb40541c7c6d3dbcb2 Author: Fernando Fernandez Mancera Date: Tue May 8 16:25:40 2018 +0200 Make dh_param_* stuff static again. Signed-off-by: Fernando Fernandez Mancera --- src/common/crypto_dh.c | 6 +++--- 1 file changed, 3 insertions(+), 3

[tor-commits] [tor/master] Refactor crypto.[ch] into smaller HKDF module.

2018-06-17 Thread nickm
commit d38e7ddf5b930ae7e4d3a5da63cfc32d92a8dfa7 Author: Fernando Fernandez Mancera Date: Fri May 18 10:47:35 2018 +0200 Refactor crypto.[ch] into smaller HKDF module. Add two new files (crypto_hkdf.c, crypto_hkdf.h) as new module of crypto.[ch]. This new module includes all

[tor-commits] [tor/master] Add crypto_log_errors() to crypto_util.[ch]

2018-06-17 Thread nickm
commit 5b7a12d58a9e58d35c0007062377ea308faf1989 Author: Fernando Fernandez Mancera Date: Tue May 8 15:40:11 2018 +0200 Add crypto_log_errors() to crypto_util.[ch] crypto_log_errors() has been moved to crypto_util.[ch]. It was duplicated in some files so they have been removed

[tor-commits] [tor/master] Refactor crypto.[ch] into smaller DH module.

2018-06-17 Thread nickm
commit f91469c16555836f91691be8adc9c29bb33dfc3f Author: Fernando Fernandez Mancera Date: Tue May 8 15:51:39 2018 +0200 Refactor crypto.[ch] into smaller DH module. Add two new files (crypto_dh.c, crypto_dh.h) as new module of crypto.[ch]. This new module includes all

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

2018-06-17 Thread nickm
commit 6107a2127bf33059fb27fe0a57f24f1b21ef51aa Merge: 7e7585d0a 340fcc7e2 Author: Nick Mathewson Date: Sun Jun 17 19:24:48 2018 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 .editorconfig | 33 + 1 file changed, 33 insertions(+)

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

2018-06-17 Thread nickm
commit a360bf287d8220ec2e4899c57ed47a2a91e3bcb9 Merge: ccf1eb316 6107a2127 Author: Nick Mathewson Date: Sun Jun 17 19:24:48 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 .editorconfig | 33 + 1 file changed, 33 insertions(+)

[tor-commits] [tor/master] Add .editorconfig to follow coding standards style

2018-06-17 Thread nickm
commit 9b5b8e5bad550ded361948d457b230821f47681f Author: juga0 Date: Sun Jun 3 10:44:02 2018 + Add .editorconfig to follow coding standards style --- .editorconfig | 33 + 1 file changed, 33 insertions(+) diff --git a/.editorconfig b/.editorconfig new

[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4

2018-06-17 Thread nickm
commit 70e672f8567088ce6ce704dc1f51dd3ce2873a38 Merge: 8184f45ad a360bf287 Author: Nick Mathewson Date: Sun Jun 17 19:24:48 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 .editorconfig | 33 + 1 file changed, 33 insertions(+)

[tor-commits] [tor/maint-0.3.4] Merge branch 'maint-0.3.3' into maint-0.3.4

2018-06-17 Thread nickm
commit 70e672f8567088ce6ce704dc1f51dd3ce2873a38 Merge: 8184f45ad a360bf287 Author: Nick Mathewson Date: Sun Jun 17 19:24:48 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 .editorconfig | 33 + 1 file changed, 33 insertions(+)

[tor-commits] [tor/master] Add explanation about editorconf in coding standards

2018-06-17 Thread nickm
commit cc09ff253e2516ea3bc4bdd7fa8c6052b36900e6 Author: juga0 Date: Mon Jun 11 21:29:40 2018 + Add explanation about editorconf in coding standards so that developers know what is .editorconfig for. --- doc/HACKING/CodingStandards.md | 3 +++ 1 file changed, 3 insertions(+)

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

2018-06-17 Thread nickm
commit a360bf287d8220ec2e4899c57ed47a2a91e3bcb9 Merge: ccf1eb316 6107a2127 Author: Nick Mathewson Date: Sun Jun 17 19:24:48 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 .editorconfig | 33 + 1 file changed, 33 insertions(+)

[tor-commits] [tor/release-0.2.9] Add .editorconfig to follow coding standards style

2018-06-17 Thread nickm
commit dd69e74e3f0f25f76107f9ef0aaacbea85271316 Author: juga0 Date: Sun Jun 3 10:44:02 2018 + Add .editorconfig to follow coding standards style --- .editorconfig | 33 + 1 file changed, 33 insertions(+) diff --git a/.editorconfig b/.editorconfig new

[tor-commits] [tor/master] Merge remote-tracking branch 'juga/editorconfig'

2018-06-17 Thread nickm
commit 4e439cd4010c7a6e511470a84ebf1ca830305fb3 Merge: 2e88ba985 cc09ff253 Author: Nick Mathewson Date: Sun Jun 17 19:24:58 2018 -0400 Merge remote-tracking branch 'juga/editorconfig' doc/HACKING/CodingStandards.md | 3 +++ 1 file changed, 3 insertions(+)

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

2018-06-17 Thread nickm
commit 340fcc7e2e1c1c78bb03c997601bf57bde9bf8e6 Merge: 9713ecfc4 dd69e74e3 Author: Nick Mathewson Date: Sun Jun 17 19:24:48 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 .editorconfig | 33 + 1 file changed, 33 insertions(+)

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

2018-06-17 Thread nickm
commit 340fcc7e2e1c1c78bb03c997601bf57bde9bf8e6 Merge: 9713ecfc4 dd69e74e3 Author: Nick Mathewson Date: Sun Jun 17 19:24:48 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 .editorconfig | 33 + 1 file changed, 33 insertions(+)

[tor-commits] [tor/maint-0.3.2] Add .editorconfig to follow coding standards style

2018-06-17 Thread nickm
commit dd69e74e3f0f25f76107f9ef0aaacbea85271316 Author: juga0 Date: Sun Jun 3 10:44:02 2018 + Add .editorconfig to follow coding standards style --- .editorconfig | 33 + 1 file changed, 33 insertions(+) diff --git a/.editorconfig b/.editorconfig new

[tor-commits] [tor/maint-0.2.9] Add .editorconfig to follow coding standards style

2018-06-17 Thread nickm
commit dd69e74e3f0f25f76107f9ef0aaacbea85271316 Author: juga0 Date: Sun Jun 3 10:44:02 2018 + Add .editorconfig to follow coding standards style --- .editorconfig | 33 + 1 file changed, 33 insertions(+) diff --git a/.editorconfig b/.editorconfig new

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

2018-06-17 Thread nickm
commit 6107a2127bf33059fb27fe0a57f24f1b21ef51aa Merge: 7e7585d0a 340fcc7e2 Author: Nick Mathewson Date: Sun Jun 17 19:24:48 2018 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 .editorconfig | 33 + 1 file changed, 33 insertions(+)

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

2018-06-17 Thread nickm
commit 340fcc7e2e1c1c78bb03c997601bf57bde9bf8e6 Merge: 9713ecfc4 dd69e74e3 Author: Nick Mathewson Date: Sun Jun 17 19:24:48 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 .editorconfig | 33 + 1 file changed, 33 insertions(+)

[tor-commits] [tor/maint-0.3.4] Add .editorconfig to follow coding standards style

2018-06-17 Thread nickm
commit dd69e74e3f0f25f76107f9ef0aaacbea85271316 Author: juga0 Date: Sun Jun 3 10:44:02 2018 + Add .editorconfig to follow coding standards style --- .editorconfig | 33 + 1 file changed, 33 insertions(+) diff --git a/.editorconfig b/.editorconfig new

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

2018-06-17 Thread nickm
commit 340fcc7e2e1c1c78bb03c997601bf57bde9bf8e6 Merge: 9713ecfc4 dd69e74e3 Author: Nick Mathewson Date: Sun Jun 17 19:24:48 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 .editorconfig | 33 + 1 file changed, 33 insertions(+)

[tor-commits] [tor/maint-0.3.1] Add .editorconfig to follow coding standards style

2018-06-17 Thread nickm
commit dd69e74e3f0f25f76107f9ef0aaacbea85271316 Author: juga0 Date: Sun Jun 3 10:44:02 2018 + Add .editorconfig to follow coding standards style --- .editorconfig | 33 + 1 file changed, 33 insertions(+) diff --git a/.editorconfig b/.editorconfig new

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

2018-06-17 Thread nickm
commit 340fcc7e2e1c1c78bb03c997601bf57bde9bf8e6 Merge: 9713ecfc4 dd69e74e3 Author: Nick Mathewson Date: Sun Jun 17 19:24:48 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 .editorconfig | 33 + 1 file changed, 33 insertions(+)

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

2018-06-17 Thread nickm
commit 2ef4bccb487aabf9465f912bbb92a0ee455e4dde Merge: 75732ef4c dd69e74e3 Author: Nick Mathewson Date: Sun Jun 17 19:24:48 2018 -0400 Merge branch 'maint-0.2.9' into release-0.2.9 .editorconfig | 33 + 1 file changed, 33 insertions(+)

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

2018-06-17 Thread nickm
commit 340fcc7e2e1c1c78bb03c997601bf57bde9bf8e6 Merge: 9713ecfc4 dd69e74e3 Author: Nick Mathewson Date: Sun Jun 17 19:24:48 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 .editorconfig | 33 + 1 file changed, 33 insertions(+)

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

2018-06-17 Thread nickm
commit 6107a2127bf33059fb27fe0a57f24f1b21ef51aa Merge: 7e7585d0a 340fcc7e2 Author: Nick Mathewson Date: Sun Jun 17 19:24:48 2018 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 .editorconfig | 33 + 1 file changed, 33 insertions(+)

[tor-commits] [tor/master] Add .editorconfig to follow coding standards style

2018-06-17 Thread nickm
commit dd69e74e3f0f25f76107f9ef0aaacbea85271316 Author: juga0 Date: Sun Jun 3 10:44:02 2018 + Add .editorconfig to follow coding standards style --- .editorconfig | 33 + 1 file changed, 33 insertions(+) diff --git a/.editorconfig b/.editorconfig new

[tor-commits] [tor/maint-0.3.3] Add .editorconfig to follow coding standards style

2018-06-17 Thread nickm
commit dd69e74e3f0f25f76107f9ef0aaacbea85271316 Author: juga0 Date: Sun Jun 3 10:44:02 2018 + Add .editorconfig to follow coding standards style --- .editorconfig | 33 + 1 file changed, 33 insertions(+) diff --git a/.editorconfig b/.editorconfig new

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

2018-06-17 Thread nickm
commit 6107a2127bf33059fb27fe0a57f24f1b21ef51aa Merge: 7e7585d0a 340fcc7e2 Author: Nick Mathewson Date: Sun Jun 17 19:24:48 2018 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 .editorconfig | 33 + 1 file changed, 33 insertions(+)

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

2018-06-17 Thread nickm
commit a360bf287d8220ec2e4899c57ed47a2a91e3bcb9 Merge: ccf1eb316 6107a2127 Author: Nick Mathewson Date: Sun Jun 17 19:24:48 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 .editorconfig | 33 + 1 file changed, 33 insertions(+)

[tor-commits] [tor/master] Merge remote-tracking branch 'github/bug26152_035'

2018-06-17 Thread nickm
commit 987174cc6fb4915299236fd76e3bb6c893e78653 Merge: 4e439cd40 8483241b4 Author: Nick Mathewson Date: Sun Jun 17 19:28:59 2018 -0400 Merge remote-tracking branch 'github/bug26152_035' changes/bug26152 | 4 src/test/test_crypto.c | 9 +++-- 2 files changed, 11

[tor-commits] [tor/master] Improve openssl_version tests with better messages

2018-06-17 Thread nickm
commit 8483241b4e2538e9adb75c7ffed2787afd361df6 Author: Nick Mathewson Date: Mon May 21 15:06:45 2018 -0400 Improve openssl_version tests with better messages These tests would report errors, but wouldn't report the offending strings. --- changes/bug26152 | 4

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

2018-06-17 Thread nickm
commit 6107a2127bf33059fb27fe0a57f24f1b21ef51aa Merge: 7e7585d0a 340fcc7e2 Author: Nick Mathewson Date: Sun Jun 17 19:24:48 2018 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 .editorconfig | 33 + 1 file changed, 33 insertions(+)

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

2018-06-17 Thread nickm
commit ac46e04feaf3efd9c97a68922678214d963df322 Merge: 58ac00fce 340fcc7e2 Author: Nick Mathewson Date: Sun Jun 17 19:24:48 2018 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 .editorconfig | 33 + 1 file changed, 33 insertions(+)

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

2018-06-17 Thread nickm
commit 6107a2127bf33059fb27fe0a57f24f1b21ef51aa Merge: 7e7585d0a 340fcc7e2 Author: Nick Mathewson Date: Sun Jun 17 19:24:48 2018 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 .editorconfig | 33 + 1 file changed, 33 insertions(+)

[tor-commits] [tor/release-0.3.3] Add .editorconfig to follow coding standards style

2018-06-17 Thread nickm
commit dd69e74e3f0f25f76107f9ef0aaacbea85271316 Author: juga0 Date: Sun Jun 3 10:44:02 2018 + Add .editorconfig to follow coding standards style --- .editorconfig | 33 + 1 file changed, 33 insertions(+) diff --git a/.editorconfig b/.editorconfig new

[tor-commits] [tor/release-0.3.2] Add .editorconfig to follow coding standards style

2018-06-17 Thread nickm
commit dd69e74e3f0f25f76107f9ef0aaacbea85271316 Author: juga0 Date: Sun Jun 3 10:44:02 2018 + Add .editorconfig to follow coding standards style --- .editorconfig | 33 + 1 file changed, 33 insertions(+) diff --git a/.editorconfig b/.editorconfig new

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

2018-06-17 Thread nickm
commit 6107a2127bf33059fb27fe0a57f24f1b21ef51aa Merge: 7e7585d0a 340fcc7e2 Author: Nick Mathewson Date: Sun Jun 17 19:24:48 2018 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 .editorconfig | 33 + 1 file changed, 33 insertions(+)

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

2018-06-17 Thread nickm
commit a360bf287d8220ec2e4899c57ed47a2a91e3bcb9 Merge: ccf1eb316 6107a2127 Author: Nick Mathewson Date: Sun Jun 17 19:24:48 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 .editorconfig | 33 + 1 file changed, 33 insertions(+)

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

2018-06-17 Thread nickm
commit 70e672f8567088ce6ce704dc1f51dd3ce2873a38 Merge: 8184f45ad a360bf287 Author: Nick Mathewson Date: Sun Jun 17 19:24:48 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 .editorconfig | 33 + 1 file changed, 33 insertions(+)

[tor-commits] [torspec/master] Rephrase bandwidth-file line description

2018-06-17 Thread nickm
commit d7f9766ee2e974c12e47f8cfd2bbd0232b323678 Author: juga0 Date: Thu May 31 18:15:30 2018 + Rephrase bandwidth-file line description also change version of Tor where 1st appeared. --- dir-spec.txt | 7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) diff --git

[tor-commits] [torspec/master] Fix typo

2018-06-17 Thread nickm
commit b36cc500b886f104732f214573f02a98a1b4e443 Author: juga0 Date: Thu May 31 18:59:47 2018 + Fix typo --- dir-spec.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dir-spec.txt b/dir-spec.txt index 233e174..2987a18 100644 --- a/dir-spec.txt +++ b/dir-spec.txt

[tor-commits] [torspec/master] Merge remote-tracking branch 'juga/ticket26222'

2018-06-17 Thread nickm
commit 6533c852328f5b18bd36c249ba7bb8f9b66ab1c2 Merge: 419ba0c b36cc50 Author: Nick Mathewson Date: Sun Jun 17 19:27:52 2018 -0400 Merge remote-tracking branch 'juga/ticket26222' dir-spec.txt | 24 1 file changed, 24 insertions(+)

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

2018-06-17 Thread nickm
commit 340fcc7e2e1c1c78bb03c997601bf57bde9bf8e6 Merge: 9713ecfc4 dd69e74e3 Author: Nick Mathewson Date: Sun Jun 17 19:24:48 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 .editorconfig | 33 + 1 file changed, 33 insertions(+)

[tor-commits] [tor/release-0.3.4] Add .editorconfig to follow coding standards style

2018-06-17 Thread nickm
commit dd69e74e3f0f25f76107f9ef0aaacbea85271316 Author: juga0 Date: Sun Jun 3 10:44:02 2018 + Add .editorconfig to follow coding standards style --- .editorconfig | 33 + 1 file changed, 33 insertions(+) diff --git a/.editorconfig b/.editorconfig new

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

2018-06-17 Thread nickm
commit 2e88ba985ded9c3e72c60e426c96469c6cde804f Merge: 1de722d7a 70e672f85 Author: Nick Mathewson Date: Sun Jun 17 19:24:48 2018 -0400 Merge branch 'maint-0.3.4' .editorconfig | 33 + 1 file changed, 33 insertions(+)

[tor-commits] [tor/release-0.3.1] Add .editorconfig to follow coding standards style

2018-06-17 Thread nickm
commit dd69e74e3f0f25f76107f9ef0aaacbea85271316 Author: juga0 Date: Sun Jun 3 10:44:02 2018 + Add .editorconfig to follow coding standards style --- .editorconfig | 33 + 1 file changed, 33 insertions(+) diff --git a/.editorconfig b/.editorconfig new

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

2018-06-17 Thread nickm
commit 8a6e2d5da529564fe61e2841be1b497b0432ca1f Merge: c134ccfac a360bf287 Author: Nick Mathewson Date: Sun Jun 17 19:24:48 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 .editorconfig | 33 + 1 file changed, 33 insertions(+)

[tor-commits] [torspec/master] Add bandwidth-file line to vote documents

2018-06-17 Thread nickm
commit 84591df1c20856d07411af7b487710e97d76a60e Author: juga0 Date: Wed May 30 21:52:47 2018 + Add bandwidth-file line to vote documents --- dir-spec.txt | 25 + 1 file changed, 25 insertions(+) diff --git a/dir-spec.txt b/dir-spec.txt index 5f2a713..2253ec6

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

2018-06-17 Thread nickm
commit a360bf287d8220ec2e4899c57ed47a2a91e3bcb9 Merge: ccf1eb316 6107a2127 Author: Nick Mathewson Date: Sun Jun 17 19:24:48 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 .editorconfig | 33 + 1 file changed, 33 insertions(+)

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

2018-06-17 Thread nickm
commit f5b9e43d0db80a5d3e12491d2be23a2ea5f27e87 Merge: 7bcbd49ad 6107a2127 Author: Nick Mathewson Date: Sun Jun 17 19:24:48 2018 -0400 Merge branch 'maint-0.3.2' into release-0.3.2 .editorconfig | 33 + 1 file changed, 33 insertions(+)

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

2018-06-17 Thread nickm
commit 340fcc7e2e1c1c78bb03c997601bf57bde9bf8e6 Merge: 9713ecfc4 dd69e74e3 Author: Nick Mathewson Date: Sun Jun 17 19:24:48 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 .editorconfig | 33 + 1 file changed, 33 insertions(+)

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

2018-06-17 Thread nickm
commit 340fcc7e2e1c1c78bb03c997601bf57bde9bf8e6 Merge: 9713ecfc4 dd69e74e3 Author: Nick Mathewson Date: Sun Jun 17 19:24:48 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 .editorconfig | 33 + 1 file changed, 33 insertions(+)

[tor-commits] [torspec/master] Change interval of time for bandwidth changes

2018-06-17 Thread nickm
commit e4cf6865bb7a8743f92f687f27febe29eb060954 Author: juga0 Date: Mon Jun 4 21:07:43 2018 + Change interval of time for bandwidth changes Paragraph on events required to update descriptor were not reflecting changes made in #23856 where the bandwidth changes need to

[tor-commits] [torspec/master] Merge remote-tracking branch 'juga/bug26301'

2018-06-17 Thread nickm
commit 4ead6e1e53566d13246f2323276ee6d3ded8cf7f Merge: 6533c85 e4cf686 Author: Nick Mathewson Date: Sun Jun 17 19:30:33 2018 -0400 Merge remote-tracking branch 'juga/bug26301' dir-spec.txt | 9 ++--- 1 file changed, 6 insertions(+), 3 deletions(-)

[tor-commits] [torspec/master] Include uptime in bandwidth changes event

2018-06-17 Thread nickm
commit faacf026eba54ad7e29278cb379c7fd92a212025 Author: juga0 Date: Mon Jun 4 07:24:50 2018 + Include uptime in bandwidth changes event The descriptor would be updated on bandwidth changes only when the uptime is less than 24h. --- dir-spec.txt | 9 ++--- 1 file

[tor-commits] [tor/master] Avoid casting smartlist index implicitly

2018-06-17 Thread nickm
commit 39bbb8d9cfb0258b1e65dc98177e0773a19e4eb0 Author: rl1987 Date: Mon Jun 4 11:56:37 2018 +0300 Avoid casting smartlist index implicitly --- changes/bug26282 | 4 src/common/util.c | 4 ++-- src/or/control.c | 2 +- src/or/geoip.c| 2 +- 4 files changed, 8 insertions(+), 4

[tor-commits] [tor/master] Merge remote-tracking branch 'rl1987/bug26282'

2018-06-17 Thread nickm
commit d5e4b6983f88d6a31303008897e6f75e9a9777ff Merge: 987174cc6 39bbb8d9c Author: Nick Mathewson Date: Sun Jun 17 19:32:08 2018 -0400 Merge remote-tracking branch 'rl1987/bug26282' changes/bug26282 | 4 src/common/util.c | 4 ++-- src/or/control.c | 2 +- src/or/geoip.c| 2 +-