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

[tor/release-0.2.6] Merge branch 'maint-0.2.4' into maint-0.2.5
by nickm＠torproject.org 05 Jul '16

05 Jul '16

commit 19078b1b89ff7db5ceb917d34b2d152f73027334 Merge: 9d3de77 6b8c3d2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 5 13:51:34 2016 -0400 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/19271 | 2 ++ 1 file changed, 2 insertions(+)

1 0

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

05 Jul '16

commit 19078b1b89ff7db5ceb917d34b2d152f73027334 Merge: 9d3de77 6b8c3d2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 5 13:51:34 2016 -0400 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/19271 | 2 ++ 1 file changed, 2 insertions(+)

1 0

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

05 Jul '16

commit 4f4d77c435d74bdb6359e86ff60c4a4c0d7e45b8 Merge: 8f44d28 7c25b41 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 5 13:52:18 2016 -0400 Merge branch 'maint-0.2.7' into maint-0.2.8 changes/19271 | 2 ++ 1 file changed, 2 insertions(+)

1 0

[tor/maint-0.2.8] whoops. changelog file for 19271.
by nickm＠torproject.org 05 Jul '16

05 Jul '16

commit 6b8c3d2bc020035c2627fa0ffcc22c036270e122 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 5 13:51:21 2016 -0400 whoops. changelog file for 19271. --- changes/19271 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/changes/19271 b/changes/19271 new file mode 100644 index 0000000..dc06ead --- /dev/null +++ b/changes/19271 @@ -0,0 +1,2 @@ + o Directory authority changes: + - Urras is no longer a directory authority. Closes ticket 19271.

1 0

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

05 Jul '16

commit 7c25b41c8cfffebddbc7ba4d66aa345642eebc1f Merge: 6e96aad 92891de Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 5 13:52:04 2016 -0400 Merge branch 'maint-0.2.6' into maint-0.2.7 changes/19271 | 2 ++ 1 file changed, 2 insertions(+)

1 0

[tor/release-0.2.4] Merge branch 'maint-0.2.4' into release-0.2.4
by nickm＠torproject.org 05 Jul '16

05 Jul '16

commit 0e2f18868cc7634cf4ef8bc7823f61cd301497ba Merge: fd6ba23 6b8c3d2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 5 13:51:28 2016 -0400 Merge branch 'maint-0.2.4' into release-0.2.4 changes/19271 | 2 ++ 1 file changed, 2 insertions(+)

1 0

[tor/maint-0.2.8] Merge branch 'maint-0.2.5' into maint-0.2.6
by nickm＠torproject.org 05 Jul '16

05 Jul '16

commit 92891ded3016dd7cabb34b401ff964e325bd7d1d Merge: c28ba99 19078b1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 5 13:51:51 2016 -0400 Merge branch 'maint-0.2.5' into maint-0.2.6 changes/19271 | 2 ++ 1 file changed, 2 insertions(+)

1 0

[tor/maint-0.2.8] Merge branch 'maint-0.2.7' into maint-0.2.8
by nickm＠torproject.org 05 Jul '16

05 Jul '16

commit 4f4d77c435d74bdb6359e86ff60c4a4c0d7e45b8 Merge: 8f44d28 7c25b41 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 5 13:52:18 2016 -0400 Merge branch 'maint-0.2.7' into maint-0.2.8 changes/19271 | 2 ++ 1 file changed, 2 insertions(+)

1 0

[tor/master] Merge branch 'maint-0.2.5' into maint-0.2.6
by nickm＠torproject.org 05 Jul '16

05 Jul '16

commit 92891ded3016dd7cabb34b401ff964e325bd7d1d Merge: c28ba99 19078b1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 5 13:51:51 2016 -0400 Merge branch 'maint-0.2.5' into maint-0.2.6 changes/19271 | 2 ++ 1 file changed, 2 insertions(+)

1 0

[tor/release-0.2.5] Merge branch 'maint-0.2.5' into release-0.2.5
by nickm＠torproject.org 05 Jul '16

05 Jul '16

commit 53947389a77d6d7a01a7c79624390b9bd6c42d6b Merge: 8c2cad5 19078b1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 5 13:51:40 2016 -0400 Merge branch 'maint-0.2.5' into release-0.2.5 changes/19271 | 2 ++ 1 file changed, 2 insertions(+)

1 0