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

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

23 Oct '17

commit 5d37d270075ba64d08d95eb0d5cc0d3473acbdbb Merge: 7a4741c23 d29e4c059 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 23 08:46:29 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1

1 0

[tor/master] Merge branch 'maint-0.2.9' into maint-0.3.0
by nickm＠torproject.org 23 Oct '17

23 Oct '17

commit d29e4c05973d9e371e800a8b0ed5f28fb8f1dc22 Merge: f7f55acae 68dea082e Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 23 08:46:29 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/bug22349 | 9 +++++++++ src/or/dirserv.c | 56 ++++++++++++++++++++++++++++++++++++++++++++------------ 2 files changed, 53 insertions(+), 12 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.3.0' into maint-0.3.1
by nickm＠torproject.org 23 Oct '17

23 Oct '17

commit 5d37d270075ba64d08d95eb0d5cc0d3473acbdbb Merge: 7a4741c23 d29e4c059 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 23 08:46:29 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1

1 0

[tor/maint-0.3.2] Merge branch 'maint-0.2.9' into maint-0.3.0
by nickm＠torproject.org 23 Oct '17

23 Oct '17

commit d29e4c05973d9e371e800a8b0ed5f28fb8f1dc22 Merge: f7f55acae 68dea082e Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 23 08:46:29 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/bug22349 | 9 +++++++++ src/or/dirserv.c | 56 ++++++++++++++++++++++++++++++++++++++++++++------------ 2 files changed, 53 insertions(+), 12 deletions(-)

1 0

[tor/release-0.3.0] Merge remote-tracking branch 'public/bug22349_029' into maint-0.2.9
by nickm＠torproject.org 23 Oct '17

23 Oct '17

commit 68dea082e728094e393ee7629854e5e8ad9bbe32 Merge: 43ebe54a2 f367453cb Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 23 08:46:26 2017 -0400 Merge remote-tracking branch 'public/bug22349_029' into maint-0.2.9 changes/bug22349 | 9 +++++++++ src/or/dirserv.c | 56 ++++++++++++++++++++++++++++++++++++++++++++------------ 2 files changed, 53 insertions(+), 12 deletions(-)

1 0

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

23 Oct '17

commit 5d37d270075ba64d08d95eb0d5cc0d3473acbdbb Merge: 7a4741c23 d29e4c059 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 23 08:46:29 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1

1 0

[tor/release-0.3.1] Merge remote-tracking branch 'public/bug22349_029' into maint-0.2.9
by nickm＠torproject.org 23 Oct '17

23 Oct '17

commit 68dea082e728094e393ee7629854e5e8ad9bbe32 Merge: 43ebe54a2 f367453cb Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 23 08:46:26 2017 -0400 Merge remote-tracking branch 'public/bug22349_029' into maint-0.2.9 changes/bug22349 | 9 +++++++++ src/or/dirserv.c | 56 ++++++++++++++++++++++++++++++++++++++++++++------------ 2 files changed, 53 insertions(+), 12 deletions(-)

1 0

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

23 Oct '17

commit d29e4c05973d9e371e800a8b0ed5f28fb8f1dc22 Merge: f7f55acae 68dea082e Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 23 08:46:29 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/bug22349 | 9 +++++++++ src/or/dirserv.c | 56 ++++++++++++++++++++++++++++++++++++++++++++------------ 2 files changed, 53 insertions(+), 12 deletions(-)

1 0

[tor/release-0.3.0] Merge branch 'maint-0.3.0' into release-0.3.0
by nickm＠torproject.org 23 Oct '17

23 Oct '17

commit ee3d83dbf7ace00080bfa9c77e0fd236f67d1fa8 Merge: 44019d73f d29e4c059 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 23 08:46:29 2017 -0400 Merge branch 'maint-0.3.0' into release-0.3.0 changes/bug22349 | 9 +++++++++ src/or/dirserv.c | 56 ++++++++++++++++++++++++++++++++++++++++++++------------ 2 files changed, 53 insertions(+), 12 deletions(-)

1 0

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

23 Oct '17

commit d29e4c05973d9e371e800a8b0ed5f28fb8f1dc22 Merge: f7f55acae 68dea082e Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 23 08:46:29 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/bug22349 | 9 +++++++++ src/or/dirserv.c | 56 ++++++++++++++++++++++++++++++++++++++++++++------------ 2 files changed, 53 insertions(+), 12 deletions(-)

1 0