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

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

12 Dec '17

commit 31ce03a2b976966f8c4045f4a3e936b02b25352e Merge: cdee62da9 d3b7a2bd2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Dec 12 09:13:12 2017 -0500 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/{bug23682 => bug23862} | 0 1 file changed, 0 insertions(+), 0 deletions(-)

1 0

[tor/release-0.3.1] Merge branch 'bug24167_025' into maint-0.2.5
by nickm＠torproject.org 12 Dec '17

12 Dec '17

commit 1deda2106b0af16daaecc2e27982a28054e28345 Merge: f5d4bdf30 95238eb91 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 11 16:56:28 2017 -0500 Merge branch 'bug24167_025' into maint-0.2.5 changes/bug24167 | 7 +++++++ src/or/connection.c | 4 ++++ 2 files changed, 11 insertions(+)

1 0

[tor/release-0.3.1] Merge branch 'maint-0.2.5' into maint-0.2.8
by nickm＠torproject.org 12 Dec '17

12 Dec '17

commit f7151387d937bd1113f4c694b170305d80dde9fa Merge: bc1ea4f47 1deda2106 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 11 16:56:31 2017 -0500 Merge branch 'maint-0.2.5' into maint-0.2.8 changes/bug24167 | 7 +++++++ src/or/connection.c | 4 ++++ 2 files changed, 11 insertions(+)

1 0

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

12 Dec '17

commit da38904efbdd0c2c6b754aed7f75201e3c1cd97a Merge: 2ea573ece eecfed0cd Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 11 16:56:31 2017 -0500 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/bug24167 | 7 +++++++ src/or/connection.c | 4 ++++ 2 files changed, 11 insertions(+)

1 0

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

12 Dec '17

commit eecfed0cd2c8c92175106e211d1662fa43fc60bc Merge: eaaa1108a f7151387d Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 11 16:56:31 2017 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/bug24167 | 7 +++++++ src/or/connection.c | 4 ++++ 2 files changed, 11 insertions(+)

1 0

[tor/release-0.3.1] Merge branch 'maint-0.3.0' into maint-0.3.1
by nickm＠torproject.org 12 Dec '17

12 Dec '17

commit cdee62da9e06dfc91a3100248bd9b8e82345347f Merge: 04524443d da38904ef Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 11 16:56:31 2017 -0500 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/bug24167 | 7 +++++++ src/or/connection.c | 4 ++++ 2 files changed, 11 insertions(+)

1 0

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

12 Dec '17

commit bda3c544478f40270d60fbe93e4d8703a1c5ff5e Merge: ee1bbe21a cdee62da9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 11 16:56:31 2017 -0500 Merge branch 'maint-0.3.1' into release-0.3.1 changes/bug24167 | 7 +++++++ src/or/connection.c | 4 ++++ 2 files changed, 11 insertions(+)

1 0

[tor/release-0.3.1] rename changes file
by nickm＠torproject.org 12 Dec '17

12 Dec '17

commit d3b7a2bd275842e9826946428d25fc5b72153f7c Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Dec 12 09:13:05 2017 -0500 rename changes file --- changes/{bug23682 => bug23862} | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/changes/bug23682 b/changes/bug23862 similarity index 100% rename from changes/bug23682 rename to changes/bug23862

1 0

[tor/release-0.3.1] Merge branch 'maint-0.3.0' into maint-0.3.1
by nickm＠torproject.org 12 Dec '17

12 Dec '17

commit 31ce03a2b976966f8c4045f4a3e936b02b25352e Merge: cdee62da9 d3b7a2bd2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Dec 12 09:13:12 2017 -0500 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/{bug23682 => bug23862} | 0 1 file changed, 0 insertions(+), 0 deletions(-)

1 0

[tor/release-0.3.2] Merge branch 'maint-0.2.5' into maint-0.2.8
by nickm＠torproject.org 12 Dec '17

12 Dec '17

commit f7151387d937bd1113f4c694b170305d80dde9fa Merge: bc1ea4f47 1deda2106 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 11 16:56:31 2017 -0500 Merge branch 'maint-0.2.5' into maint-0.2.8 changes/bug24167 | 7 +++++++ src/or/connection.c | 4 ++++ 2 files changed, 11 insertions(+)

1 0