July 2017 - tor-commits - lists.torproject.org

[tor/maint-0.3.1] Merge branch 'maint-0.2.4' into maint-0.2.5
by nickm＠torproject.org 26 Jul '17

26 Jul '17

commit af39c13a0385c9c61b3a7ffdd6362d2f86e3f44b Merge: 09618bc48 ebb441ded Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 26 15:39:55 2017 -0400 Merge branch 'maint-0.2.4' into maint-0.2.5 .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/maint-0.3.1] Point travis to #tor-ci, not #tor-bots
by nickm＠torproject.org 26 Jul '17

26 Jul '17

commit ebb441ded25420bad941d970ef650552d6cc2f9c Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 26 15:39:50 2017 -0400 Point travis to #tor-ci, not #tor-bots --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index fa0337b49..59b32dbe4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ compiler: notifications: irc: channels: - - "irc.oftc.net#tor-bots" + - "irc.oftc.net#tor-ci" template: - "%{repository} %{branch} %{commit} - %{author}: %{commit_subject}" - "Build #%{build_number} %{result}. Details: %{build_url}"

1 0

[tor/master] Merge branch 'maint-0.2.7-redux' into maint-0.2.8
by nickm＠torproject.org 26 Jul '17

26 Jul '17

commit 5c5eb0f095c2744e8717f613a6edcc8d118f163a Merge: fbf93614c ddd66cc01 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 26 15:39:55 2017 -0400 Merge branch 'maint-0.2.7-redux' into maint-0.2.8 .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/master] Merge branch 'maint-0.2.4' into maint-0.2.5
by nickm＠torproject.org 26 Jul '17

26 Jul '17

commit af39c13a0385c9c61b3a7ffdd6362d2f86e3f44b Merge: 09618bc48 ebb441ded Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 26 15:39:55 2017 -0400 Merge branch 'maint-0.2.4' into maint-0.2.5 .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/master] Merge branch 'maint-0.2.6' into maint-0.2.7-redux
by nickm＠torproject.org 26 Jul '17

26 Jul '17

commit ddd66cc01911da301ef61813c951418996c19593 Merge: c362c6a85 f794b40ec Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 26 15:39:55 2017 -0400 Merge branch 'maint-0.2.6' into maint-0.2.7-redux .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/maint-0.3.1] Merge branch 'maint-0.2.6' into maint-0.2.7-redux
by nickm＠torproject.org 26 Jul '17

26 Jul '17

commit ddd66cc01911da301ef61813c951418996c19593 Merge: c362c6a85 f794b40ec Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 26 15:39:55 2017 -0400 Merge branch 'maint-0.2.6' into maint-0.2.7-redux .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/maint-0.3.0] Merge branch 'maint-0.2.8' into maint-0.2.9
by nickm＠torproject.org 26 Jul '17

26 Jul '17

commit f17f7a4fdf1037a2cabe7c766231da244e30e692 Merge: f226d6460 5c5eb0f09 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 26 15:39:55 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/maint-0.3.1] Merge branch 'maint-0.2.8' into maint-0.2.9
by nickm＠torproject.org 26 Jul '17

26 Jul '17

commit f17f7a4fdf1037a2cabe7c766231da244e30e692 Merge: f226d6460 5c5eb0f09 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 26 15:39:55 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/maint-0.3.0] Merge branch 'maint-0.2.7-redux' into maint-0.2.8
by nickm＠torproject.org 26 Jul '17

26 Jul '17

commit 5c5eb0f095c2744e8717f613a6edcc8d118f163a Merge: fbf93614c ddd66cc01 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 26 15:39:55 2017 -0400 Merge branch 'maint-0.2.7-redux' into maint-0.2.8 .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/maint-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.0
by nickm＠torproject.org 26 Jul '17

26 Jul '17

commit 7021d33b91a3fe4a4d90ad660db4bba5642769f7 Merge: cc4c1840a f17f7a4fd Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 26 15:39:56 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0