June 2018 - tor-commits - lists.torproject.org

[tor/master] Merge branch 'maint-0.3.1' into maint-0.3.2
by nickm＠torproject.org 17 Jun '18

17 Jun '18

commit 6107a2127bf33059fb27fe0a57f24f1b21ef51aa Merge: 7e7585d0a 340fcc7e2 Author: Nick Mathewson <nickm(a)torproject.org> 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(+)

1 0

[tor/release-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.1
by nickm＠torproject.org 17 Jun '18

17 Jun '18

commit 340fcc7e2e1c1c78bb03c997601bf57bde9bf8e6 Merge: 9713ecfc4 dd69e74e3 Author: Nick Mathewson <nickm(a)torproject.org> 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(+)

1 0

[tor/release-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
by nickm＠torproject.org 17 Jun '18

17 Jun '18

commit 6107a2127bf33059fb27fe0a57f24f1b21ef51aa Merge: 7e7585d0a 340fcc7e2 Author: Nick Mathewson <nickm(a)torproject.org> 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(+)

1 0

[tor/release-0.3.2] Merge branch 'maint-0.2.9' into maint-0.3.1
by nickm＠torproject.org 17 Jun '18

17 Jun '18

commit 340fcc7e2e1c1c78bb03c997601bf57bde9bf8e6 Merge: 9713ecfc4 dd69e74e3 Author: Nick Mathewson <nickm(a)torproject.org> 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(+)

1 0

[tor/release-0.3.1] Merge branch 'maint-0.3.1' into release-0.3.1
by nickm＠torproject.org 17 Jun '18

17 Jun '18

commit ac46e04feaf3efd9c97a68922678214d963df322 Merge: 58ac00fce 340fcc7e2 Author: Nick Mathewson <nickm(a)torproject.org> 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(+)

1 0

[tor/release-0.3.2] Add .editorconfig to follow coding standards style
by nickm＠torproject.org 17 Jun '18

17 Jun '18

commit dd69e74e3f0f25f76107f9ef0aaacbea85271316 Author: juga0 <juga(a)riseup.net> Date: Sun Jun 3 10:44:02 2018 +0000 Add .editorconfig to follow coding standards style --- .editorconfig | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 000000000..27ed90faf --- /dev/null +++ b/.editorconfig @@ -0,0 +1,33 @@ +# this should work for all editors that support .editorconfig! +# +# on debian, emacs users should install elpa-editorconfig and vim +# users should install vim-editorconfig. + +root = true + +[*] +indent_style = space +# this remove final newline in some editors, instead of inserting it +# insert_final_newline = true +trim_trailing_whitespace = true +end_of_line = lf +charset = utf-8 +max_line_length = 79 + +[*.py] +indent_size = 4 +# to do not have final newline in python code +insert_final_newline = true + +[*.c, *.h] +# done in tests and other cases do not use 2 spaces identations, so this +# should be commented on those cases +indent_size = 2 +trim_trailing_whitespace = true + +[Makefile, *.am] +indent_style = tab + +[*-spec.txt] +# specs seem to have 76 chars max per lines as RFCs +max_line_length = 76 \ No newline at end of file

1 0

[tor/release-0.3.3] Add .editorconfig to follow coding standards style
by nickm＠torproject.org 17 Jun '18

17 Jun '18

commit dd69e74e3f0f25f76107f9ef0aaacbea85271316 Author: juga0 <juga(a)riseup.net> Date: Sun Jun 3 10:44:02 2018 +0000 Add .editorconfig to follow coding standards style --- .editorconfig | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 000000000..27ed90faf --- /dev/null +++ b/.editorconfig @@ -0,0 +1,33 @@ +# this should work for all editors that support .editorconfig! +# +# on debian, emacs users should install elpa-editorconfig and vim +# users should install vim-editorconfig. + +root = true + +[*] +indent_style = space +# this remove final newline in some editors, instead of inserting it +# insert_final_newline = true +trim_trailing_whitespace = true +end_of_line = lf +charset = utf-8 +max_line_length = 79 + +[*.py] +indent_size = 4 +# to do not have final newline in python code +insert_final_newline = true + +[*.c, *.h] +# done in tests and other cases do not use 2 spaces identations, so this +# should be commented on those cases +indent_size = 2 +trim_trailing_whitespace = true + +[Makefile, *.am] +indent_style = tab + +[*-spec.txt] +# specs seem to have 76 chars max per lines as RFCs +max_line_length = 76 \ No newline at end of file

1 0

[tor/release-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3
by nickm＠torproject.org 17 Jun '18

17 Jun '18

commit a360bf287d8220ec2e4899c57ed47a2a91e3bcb9 Merge: ccf1eb316 6107a2127 Author: Nick Mathewson <nickm(a)torproject.org> 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(+)

1 0

[tor/release-0.3.3] Merge branch 'maint-0.2.9' into maint-0.3.1
by nickm＠torproject.org 17 Jun '18

17 Jun '18

commit 340fcc7e2e1c1c78bb03c997601bf57bde9bf8e6 Merge: 9713ecfc4 dd69e74e3 Author: Nick Mathewson <nickm(a)torproject.org> 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(+)

1 0

[tor/release-0.3.2] Merge branch 'maint-0.3.2' into release-0.3.2
by nickm＠torproject.org 17 Jun '18

17 Jun '18

commit f5b9e43d0db80a5d3e12491d2be23a2ea5f27e87 Merge: 7bcbd49ad 6107a2127 Author: Nick Mathewson <nickm(a)torproject.org> 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(+)

1 0