[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.0

2017-10-23 Thread nickm
commit eac4c374e456af4f216392ec2d3b037d5f57e2f3 Merge: c93ecb818 fcd5c3144 Author: Nick Mathewson Date: Mon Oct 23 09:11:10 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 src/test/test_config.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) _

[tor-commits] [tor/master] Adjust test, now that there are 9 dirauths again

2017-10-23 Thread nickm
commit a5f5bda462d489cb02f97e9847011b46a350512a Author: Nick Mathewson Date: Mon Oct 23 09:11:07 2017 -0400 Adjust test, now that there are 9 dirauths again --- src/test/test_config.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/test_config.c b/src/test/

[tor-commits] [tor/maint-0.3.0] Merge branch 'maint-0.2.8' into maint-0.2.9

2017-10-23 Thread nickm
commit fcd5c3144a44f4081e9e7c4336b932e31ae45f77 Merge: 1db5081ba a5f5bda46 Author: Nick Mathewson Date: Mon Oct 23 09:11:10 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 src/test/test_config.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) _

[tor-commits] [tor/maint-0.2.8] Adjust test, now that there are 9 dirauths again

2017-10-23 Thread nickm
commit a5f5bda462d489cb02f97e9847011b46a350512a Author: Nick Mathewson Date: Mon Oct 23 09:11:07 2017 -0400 Adjust test, now that there are 9 dirauths again --- src/test/test_config.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/test_config.c b/src/test/

[tor-commits] [tor/master] Merge branch 'maint-0.2.8' into maint-0.2.9

2017-10-23 Thread nickm
commit fcd5c3144a44f4081e9e7c4336b932e31ae45f77 Merge: 1db5081ba a5f5bda46 Author: Nick Mathewson Date: Mon Oct 23 09:11:10 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 src/test/test_config.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) _

[tor-commits] [tor/maint-0.2.9] Adjust test, now that there are 9 dirauths again

2017-10-23 Thread nickm
commit a5f5bda462d489cb02f97e9847011b46a350512a Author: Nick Mathewson Date: Mon Oct 23 09:11:07 2017 -0400 Adjust test, now that there are 9 dirauths again --- src/test/test_config.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/test_config.c b/src/test/

[tor-commits] [tor/maint-0.3.1] Adjust test, now that there are 9 dirauths again

2017-10-23 Thread nickm
commit a5f5bda462d489cb02f97e9847011b46a350512a Author: Nick Mathewson Date: Mon Oct 23 09:11:07 2017 -0400 Adjust test, now that there are 9 dirauths again --- src/test/test_config.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/test_config.c b/src/test/

[tor-commits] [tor/master] Merge branch 'maint-0.3.2'

2017-10-23 Thread nickm
commit 49e8352f111fee754d06a39b16f83b453b62 Merge: d99c6b725 6a7aa4735 Author: Nick Mathewson Date: Mon Oct 23 09:11:10 2017 -0400 Merge branch 'maint-0.3.2' src/test/test_config.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) _

[tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.0

2017-10-23 Thread nickm
commit eac4c374e456af4f216392ec2d3b037d5f57e2f3 Merge: c93ecb818 fcd5c3144 Author: Nick Mathewson Date: Mon Oct 23 09:11:10 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 src/test/test_config.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) _

[tor-commits] [tor/maint-0.2.9] Merge branch 'maint-0.2.8' into maint-0.2.9

2017-10-23 Thread nickm
commit fcd5c3144a44f4081e9e7c4336b932e31ae45f77 Merge: 1db5081ba a5f5bda46 Author: Nick Mathewson Date: Mon Oct 23 09:11:10 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 src/test/test_config.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

[tor-commits] [tor/release-0.2.8] Merge branch 'maint-0.2.8' into release-0.2.8

2017-10-23 Thread nickm
commit 237aed037d37d4e75cdeb759830c38701df62726 Merge: 2d4983dcd a5f5bda46 Author: Nick Mathewson Date: Mon Oct 23 09:11:10 2017 -0400 Merge branch 'maint-0.2.8' into release-0.2.8 src/test/test_config.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) __

[tor-commits] [tor/release-0.3.1] Merge branch 'maint-0.2.8' into maint-0.2.9

2017-10-23 Thread nickm
commit 1db5081ba1e9201673dac296957a6d8b0a694855 Merge: c958fda6e 8cc147aa8 Author: Nick Mathewson Date: Mon Oct 23 09:06:34 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/ticket23910 | 3 +++ src/or/config.c | 3 +++ 2 files changed, 6 insertions(+) ___

[tor-commits] [tor/release-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.0

2017-10-23 Thread nickm
commit c93ecb8189773e06fa3635fff8184024c6c6e0fa Merge: 783e458c0 1db5081ba Author: Nick Mathewson Date: Mon Oct 23 09:06:34 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/ticket23910 | 3 +++ src/or/config.c | 3 +++ 2 files changed, 6 insertions(+) ___

[tor-commits] [tor/release-0.3.1] dirauth: Add bastet to the default authorities

2017-10-23 Thread nickm
commit 15a699462dbf32df78cd187e013063450b989c15 Author: David Goulet Date: Thu Oct 19 16:08:43 2017 -0400 dirauth: Add bastet to the default authorities Fixes #23910 Based on a patch by dgoulet; backported to 0.2.5 --- changes/ticket23910 | 3 +++ src/or/config.c | 3

[tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2

2017-10-23 Thread nickm
commit 009141c6a8b282b22bc9ee2fc0bf9fd9eb8ce867 Merge: b8dedaee7 23e3d57e1 Author: Nick Mathewson Date: Mon Oct 23 09:06:34 2017 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/ticket23910 | 3 +++ src/or/config.c | 3 +++ 2 files changed, 6 insertions(+) __

[tor-commits] [tor/release-0.3.1] Merge branch 'maint-0.3.1' into release-0.3.1

2017-10-23 Thread nickm
commit 11abdccc752a1caf5c522deb589231c6b5557e33 Merge: 2fee12a96 23e3d57e1 Author: Nick Mathewson Date: Mon Oct 23 09:06:34 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 changes/ticket23910 | 3 +++ src/or/config.c | 3 +++ 2 files changed, 6 insertions(+)

[tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.3.0' into maint-0.3.1

2017-10-23 Thread nickm
commit 23e3d57e12bd0ca4bedae2307440e08e22744802 Merge: df57d1e0c c93ecb818 Author: Nick Mathewson Date: Mon Oct 23 09:06:34 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/ticket23910 | 3 +++ src/or/config.c | 3 +++ 2 files changed, 6 insertions(+) ___

[tor-commits] [tor/release-0.3.1] Merge branch 'maint-0.3.0' into maint-0.3.1

2017-10-23 Thread nickm
commit 23e3d57e12bd0ca4bedae2307440e08e22744802 Merge: df57d1e0c c93ecb818 Author: Nick Mathewson Date: Mon Oct 23 09:06:34 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/ticket23910 | 3 +++ src/or/config.c | 3 +++ 2 files changed, 6 insertions(+) ___

[tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.2.5' into maint-0.2.8

2017-10-23 Thread nickm
commit 8cc147aa834b076233c5448992e145b908123908 Merge: 9a1b38546 15a699462 Author: Nick Mathewson Date: Mon Oct 23 09:04:56 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.8 changes/ticket23910 | 3 +++ src/or/config.c | 3 +++ 2 files changed, 6 insertions(+) diff --cc src/or/c

[tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.2.8' into maint-0.2.9

2017-10-23 Thread nickm
commit 1db5081ba1e9201673dac296957a6d8b0a694855 Merge: c958fda6e 8cc147aa8 Author: Nick Mathewson Date: Mon Oct 23 09:06:34 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/ticket23910 | 3 +++ src/or/config.c | 3 +++ 2 files changed, 6 insertions(+) ___

[tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.2.9' into maint-0.3.0

2017-10-23 Thread nickm
commit c93ecb8189773e06fa3635fff8184024c6c6e0fa Merge: 783e458c0 1db5081ba Author: Nick Mathewson Date: Mon Oct 23 09:06:34 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/ticket23910 | 3 +++ src/or/config.c | 3 +++ 2 files changed, 6 insertions(+) ___

[tor-commits] [tor/release-0.3.0] Merge branch 'maint-0.3.0' into release-0.3.0

2017-10-23 Thread nickm
commit 00322a9ba97cf5db534b9993e6320f75d348320f Merge: 385a44bac c93ecb818 Author: Nick Mathewson Date: Mon Oct 23 09:06:34 2017 -0400 Merge branch 'maint-0.3.0' into release-0.3.0 changes/ticket23910 | 3 +++ src/or/config.c | 3 +++ 2 files changed, 6 insertions(+)

[tor-commits] [tor/release-0.3.2] dirauth: Add bastet to the default authorities

2017-10-23 Thread nickm
commit 15a699462dbf32df78cd187e013063450b989c15 Author: David Goulet Date: Thu Oct 19 16:08:43 2017 -0400 dirauth: Add bastet to the default authorities Fixes #23910 Based on a patch by dgoulet; backported to 0.2.5 --- changes/ticket23910 | 3 +++ src/or/config.c | 3

[tor-commits] [tor/release-0.3.1] Merge branch 'maint-0.2.5' into maint-0.2.8

2017-10-23 Thread nickm
commit 8cc147aa834b076233c5448992e145b908123908 Merge: 9a1b38546 15a699462 Author: Nick Mathewson Date: Mon Oct 23 09:04:56 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.8 changes/ticket23910 | 3 +++ src/or/config.c | 3 +++ 2 files changed, 6 insertions(+) diff --cc src/or/c

[tor-commits] [tor/release-0.2.9] dirauth: Add bastet to the default authorities

2017-10-23 Thread nickm
commit 15a699462dbf32df78cd187e013063450b989c15 Author: David Goulet Date: Thu Oct 19 16:08:43 2017 -0400 dirauth: Add bastet to the default authorities Fixes #23910 Based on a patch by dgoulet; backported to 0.2.5 --- changes/ticket23910 | 3 +++ src/or/config.c | 3

[tor-commits] [tor/release-0.2.9] Merge branch 'maint-0.2.9' into release-0.2.9

2017-10-23 Thread nickm
commit d65016c0bb7a9b856847b98ab4c193876f95f9d4 Merge: b1445b19e 1db5081ba Author: Nick Mathewson Date: Mon Oct 23 09:06:34 2017 -0400 Merge branch 'maint-0.2.9' into release-0.2.9 changes/ticket23910 | 3 +++ src/or/config.c | 3 +++ 2 files changed, 6 insertions(+)

[tor-commits] [tor/release-0.3.0] Merge branch 'maint-0.2.9' into maint-0.3.0

2017-10-23 Thread nickm
commit c93ecb8189773e06fa3635fff8184024c6c6e0fa Merge: 783e458c0 1db5081ba Author: Nick Mathewson Date: Mon Oct 23 09:06:34 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/ticket23910 | 3 +++ src/or/config.c | 3 +++ 2 files changed, 6 insertions(+) ___

[tor-commits] [tor/release-0.2.9] Merge branch 'maint-0.2.8' into maint-0.2.9

2017-10-23 Thread nickm
commit 1db5081ba1e9201673dac296957a6d8b0a694855 Merge: c958fda6e 8cc147aa8 Author: Nick Mathewson Date: Mon Oct 23 09:06:34 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/ticket23910 | 3 +++ src/or/config.c | 3 +++ 2 files changed, 6 insertions(+) ___

[tor-commits] [tor/release-0.3.0] Merge branch 'maint-0.2.5' into maint-0.2.8

2017-10-23 Thread nickm
commit 8cc147aa834b076233c5448992e145b908123908 Merge: 9a1b38546 15a699462 Author: Nick Mathewson Date: Mon Oct 23 09:04:56 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.8 changes/ticket23910 | 3 +++ src/or/config.c | 3 +++ 2 files changed, 6 insertions(+) diff --cc src/or/c

[tor-commits] [tor/master] Merge branch 'maint-0.3.2'

2017-10-23 Thread nickm
commit d99c6b725263dbc140373ad9278f28d376499a1b Merge: 97046436b 009141c6a Author: Nick Mathewson Date: Mon Oct 23 09:06:34 2017 -0400 Merge branch 'maint-0.3.2' changes/ticket23910 | 3 +++ src/or/config.c | 3 +++ 2 files changed, 6 insertions(+) ___

[tor-commits] [tor/release-0.3.0] dirauth: Add bastet to the default authorities

2017-10-23 Thread nickm
commit 15a699462dbf32df78cd187e013063450b989c15 Author: David Goulet Date: Thu Oct 19 16:08:43 2017 -0400 dirauth: Add bastet to the default authorities Fixes #23910 Based on a patch by dgoulet; backported to 0.2.5 --- changes/ticket23910 | 3 +++ src/or/config.c | 3

[tor-commits] [tor/release-0.2.8] Merge branch 'maint-0.2.5' into maint-0.2.8

2017-10-23 Thread nickm
commit 8cc147aa834b076233c5448992e145b908123908 Merge: 9a1b38546 15a699462 Author: Nick Mathewson Date: Mon Oct 23 09:04:56 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.8 changes/ticket23910 | 3 +++ src/or/config.c | 3 +++ 2 files changed, 6 insertions(+) diff --cc src/or/c

[tor-commits] [tor/release-0.2.9] Merge branch 'maint-0.2.5' into maint-0.2.8

2017-10-23 Thread nickm
commit 8cc147aa834b076233c5448992e145b908123908 Merge: 9a1b38546 15a699462 Author: Nick Mathewson Date: Mon Oct 23 09:04:56 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.8 changes/ticket23910 | 3 +++ src/or/config.c | 3 +++ 2 files changed, 6 insertions(+) diff --cc src/or/c

[tor-commits] [tor/master] Merge branch 'maint-0.2.5' into maint-0.2.8

2017-10-23 Thread nickm
commit 8cc147aa834b076233c5448992e145b908123908 Merge: 9a1b38546 15a699462 Author: Nick Mathewson Date: Mon Oct 23 09:04:56 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.8 changes/ticket23910 | 3 +++ src/or/config.c | 3 +++ 2 files changed, 6 insertions(+) diff --cc src/or/c

[tor-commits] [tor/release-0.3.0] Merge branch 'maint-0.2.8' into maint-0.2.9

2017-10-23 Thread nickm
commit 1db5081ba1e9201673dac296957a6d8b0a694855 Merge: c958fda6e 8cc147aa8 Author: Nick Mathewson Date: Mon Oct 23 09:06:34 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/ticket23910 | 3 +++ src/or/config.c | 3 +++ 2 files changed, 6 insertions(+) ___

[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.0

2017-10-23 Thread nickm
commit c93ecb8189773e06fa3635fff8184024c6c6e0fa Merge: 783e458c0 1db5081ba Author: Nick Mathewson Date: Mon Oct 23 09:06:34 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/ticket23910 | 3 +++ src/or/config.c | 3 +++ 2 files changed, 6 insertions(+) ___

[tor-commits] [tor/master] Merge branch 'maint-0.2.8' into maint-0.2.9

2017-10-23 Thread nickm
commit 1db5081ba1e9201673dac296957a6d8b0a694855 Merge: c958fda6e 8cc147aa8 Author: Nick Mathewson Date: Mon Oct 23 09:06:34 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/ticket23910 | 3 +++ src/or/config.c | 3 +++ 2 files changed, 6 insertions(+) ___

[tor-commits] [tor/release-0.2.8] Merge branch 'maint-0.2.8' into release-0.2.8

2017-10-23 Thread nickm
commit 2d4983dcd7e574cdf0c663e262ff83f7a99fb7ef Merge: 15a7e24dc 8cc147aa8 Author: Nick Mathewson Date: Mon Oct 23 09:06:34 2017 -0400 Merge branch 'maint-0.2.8' into release-0.2.8 changes/ticket23910 | 3 +++ src/or/config.c | 3 +++ 2 files changed, 6 insertions(+)

[tor-commits] [tor/master] dirauth: Add bastet to the default authorities

2017-10-23 Thread nickm
commit 15a699462dbf32df78cd187e013063450b989c15 Author: David Goulet Date: Thu Oct 19 16:08:43 2017 -0400 dirauth: Add bastet to the default authorities Fixes #23910 Based on a patch by dgoulet; backported to 0.2.5 --- changes/ticket23910 | 3 +++ src/or/config.c | 3

[tor-commits] [tor/release-0.2.5] dirauth: Add bastet to the default authorities

2017-10-23 Thread nickm
commit 15a699462dbf32df78cd187e013063450b989c15 Author: David Goulet Date: Thu Oct 19 16:08:43 2017 -0400 dirauth: Add bastet to the default authorities Fixes #23910 Based on a patch by dgoulet; backported to 0.2.5 --- changes/ticket23910 | 3 +++ src/or/config.c | 3

[tor-commits] [tor/release-0.2.8] dirauth: Add bastet to the default authorities

2017-10-23 Thread nickm
commit 15a699462dbf32df78cd187e013063450b989c15 Author: David Goulet Date: Thu Oct 19 16:08:43 2017 -0400 dirauth: Add bastet to the default authorities Fixes #23910 Based on a patch by dgoulet; backported to 0.2.5 --- changes/ticket23910 | 3 +++ src/or/config.c | 3

[tor-commits] [tor/master] Merge branch 'maint-0.3.0' into maint-0.3.1

2017-10-23 Thread nickm
commit 23e3d57e12bd0ca4bedae2307440e08e22744802 Merge: df57d1e0c c93ecb818 Author: Nick Mathewson Date: Mon Oct 23 09:06:34 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/ticket23910 | 3 +++ src/or/config.c | 3 +++ 2 files changed, 6 insertions(+) ___

[tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.3.0' into maint-0.3.1

2017-10-23 Thread nickm
commit 23e3d57e12bd0ca4bedae2307440e08e22744802 Merge: df57d1e0c c93ecb818 Author: Nick Mathewson Date: Mon Oct 23 09:06:34 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/ticket23910 | 3 +++ src/or/config.c | 3 +++ 2 files changed, 6 insertions(+) __

[tor-commits] [tor/maint-0.3.2] Merge branch 'maint-0.2.9' into maint-0.3.0

2017-10-23 Thread nickm
commit c93ecb8189773e06fa3635fff8184024c6c6e0fa Merge: 783e458c0 1db5081ba Author: Nick Mathewson Date: Mon Oct 23 09:06:34 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/ticket23910 | 3 +++ src/or/config.c | 3 +++ 2 files changed, 6 insertions(+) ___

[tor-commits] [tor/release-0.2.5] Merge branch 'maint-0.2.5' into release-0.2.5

2017-10-23 Thread nickm
commit 5e1bad325965c4f91433dfbe46f4d3c268327d4e Merge: 533ae56fc 15a699462 Author: Nick Mathewson Date: Mon Oct 23 09:03:58 2017 -0400 Merge branch 'maint-0.2.5' into release-0.2.5 changes/ticket23910 | 3 +++ src/or/config.c | 3 +++ 2 files changed, 6 insertions(+)

[tor-commits] [tor/master] Merge branch 'maint-0.3.1' into maint-0.3.2

2017-10-23 Thread nickm
commit 009141c6a8b282b22bc9ee2fc0bf9fd9eb8ce867 Merge: b8dedaee7 23e3d57e1 Author: Nick Mathewson Date: Mon Oct 23 09:06:34 2017 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/ticket23910 | 3 +++ src/or/config.c | 3 +++ 2 files changed, 6 insertions(+) ___

[tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.0

2017-10-23 Thread nickm
commit c93ecb8189773e06fa3635fff8184024c6c6e0fa Merge: 783e458c0 1db5081ba Author: Nick Mathewson Date: Mon Oct 23 09:06:34 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/ticket23910 | 3 +++ src/or/config.c | 3 +++ 2 files changed, 6 insertions(+) ___

[tor-commits] [tor/maint-0.2.8] dirauth: Add bastet to the default authorities

2017-10-23 Thread nickm
commit 15a699462dbf32df78cd187e013063450b989c15 Author: David Goulet Date: Thu Oct 19 16:08:43 2017 -0400 dirauth: Add bastet to the default authorities Fixes #23910 Based on a patch by dgoulet; backported to 0.2.5 --- changes/ticket23910 | 3 +++ src/or/config.c | 3

[tor-commits] [tor/maint-0.2.8] Merge branch 'maint-0.2.5' into maint-0.2.8

2017-10-23 Thread nickm
commit 8cc147aa834b076233c5448992e145b908123908 Merge: 9a1b38546 15a699462 Author: Nick Mathewson Date: Mon Oct 23 09:04:56 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.8 changes/ticket23910 | 3 +++ src/or/config.c | 3 +++ 2 files changed, 6 insertions(+) diff --cc src/or/c

[tor-commits] [tor/maint-0.3.2] Merge branch 'maint-0.2.8' into maint-0.2.9

2017-10-23 Thread nickm
commit 1db5081ba1e9201673dac296957a6d8b0a694855 Merge: c958fda6e 8cc147aa8 Author: Nick Mathewson Date: Mon Oct 23 09:06:34 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/ticket23910 | 3 +++ src/or/config.c | 3 +++ 2 files changed, 6 insertions(+) ___

[tor-commits] [tor/maint-0.3.2] Merge branch 'maint-0.2.5' into maint-0.2.8

2017-10-23 Thread nickm
commit 8cc147aa834b076233c5448992e145b908123908 Merge: 9a1b38546 15a699462 Author: Nick Mathewson Date: Mon Oct 23 09:04:56 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.8 changes/ticket23910 | 3 +++ src/or/config.c | 3 +++ 2 files changed, 6 insertions(+) diff --cc src/or/c

[tor-commits] [tor/maint-0.3.2] Merge branch 'maint-0.3.0' into maint-0.3.1

2017-10-23 Thread nickm
commit 23e3d57e12bd0ca4bedae2307440e08e22744802 Merge: df57d1e0c c93ecb818 Author: Nick Mathewson Date: Mon Oct 23 09:06:34 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/ticket23910 | 3 +++ src/or/config.c | 3 +++ 2 files changed, 6 insertions(+) ___

[tor-commits] [tor/maint-0.3.2] dirauth: Add bastet to the default authorities

2017-10-23 Thread nickm
commit 15a699462dbf32df78cd187e013063450b989c15 Author: David Goulet Date: Thu Oct 19 16:08:43 2017 -0400 dirauth: Add bastet to the default authorities Fixes #23910 Based on a patch by dgoulet; backported to 0.2.5 --- changes/ticket23910 | 3 +++ src/or/config.c | 3

[tor-commits] [tor/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2

2017-10-23 Thread nickm
commit 009141c6a8b282b22bc9ee2fc0bf9fd9eb8ce867 Merge: b8dedaee7 23e3d57e1 Author: Nick Mathewson Date: Mon Oct 23 09:06:34 2017 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/ticket23910 | 3 +++ src/or/config.c | 3 +++ 2 files changed, 6 insertions(+) __

[tor-commits] [tor/maint-0.2.9] dirauth: Add bastet to the default authorities

2017-10-23 Thread nickm
commit 15a699462dbf32df78cd187e013063450b989c15 Author: David Goulet Date: Thu Oct 19 16:08:43 2017 -0400 dirauth: Add bastet to the default authorities Fixes #23910 Based on a patch by dgoulet; backported to 0.2.5 --- changes/ticket23910 | 3 +++ src/or/config.c | 3

[tor-commits] [tor/maint-0.3.0] Merge branch 'maint-0.2.9' into maint-0.3.0

2017-10-23 Thread nickm
commit c93ecb8189773e06fa3635fff8184024c6c6e0fa Merge: 783e458c0 1db5081ba Author: Nick Mathewson Date: Mon Oct 23 09:06:34 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/ticket23910 | 3 +++ src/or/config.c | 3 +++ 2 files changed, 6 insertions(+) __

[tor-commits] [tor/maint-0.3.0] Merge branch 'maint-0.2.8' into maint-0.2.9

2017-10-23 Thread nickm
commit 1db5081ba1e9201673dac296957a6d8b0a694855 Merge: c958fda6e 8cc147aa8 Author: Nick Mathewson Date: Mon Oct 23 09:06:34 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/ticket23910 | 3 +++ src/or/config.c | 3 +++ 2 files changed, 6 insertions(+) ___

[tor-commits] [tor/maint-0.3.1] dirauth: Add bastet to the default authorities

2017-10-23 Thread nickm
commit 15a699462dbf32df78cd187e013063450b989c15 Author: David Goulet Date: Thu Oct 19 16:08:43 2017 -0400 dirauth: Add bastet to the default authorities Fixes #23910 Based on a patch by dgoulet; backported to 0.2.5 --- changes/ticket23910 | 3 +++ src/or/config.c | 3

[tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.2.8' into maint-0.2.9

2017-10-23 Thread nickm
commit 1db5081ba1e9201673dac296957a6d8b0a694855 Merge: c958fda6e 8cc147aa8 Author: Nick Mathewson Date: Mon Oct 23 09:06:34 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/ticket23910 | 3 +++ src/or/config.c | 3 +++ 2 files changed, 6 insertions(+) ___

[tor-commits] [tor/maint-0.2.9] Merge branch 'maint-0.2.8' into maint-0.2.9

2017-10-23 Thread nickm
commit 1db5081ba1e9201673dac296957a6d8b0a694855 Merge: c958fda6e 8cc147aa8 Author: Nick Mathewson Date: Mon Oct 23 09:06:34 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/ticket23910 | 3 +++ src/or/config.c | 3 +++ 2 files changed, 6 insertions(+) __

[tor-commits] [tor/maint-0.3.0] dirauth: Add bastet to the default authorities

2017-10-23 Thread nickm
commit 15a699462dbf32df78cd187e013063450b989c15 Author: David Goulet Date: Thu Oct 19 16:08:43 2017 -0400 dirauth: Add bastet to the default authorities Fixes #23910 Based on a patch by dgoulet; backported to 0.2.5 --- changes/ticket23910 | 3 +++ src/or/config.c | 3

[tor-commits] [tor/maint-0.3.0] Merge branch 'maint-0.2.5' into maint-0.2.8

2017-10-23 Thread nickm
commit 8cc147aa834b076233c5448992e145b908123908 Merge: 9a1b38546 15a699462 Author: Nick Mathewson Date: Mon Oct 23 09:04:56 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.8 changes/ticket23910 | 3 +++ src/or/config.c | 3 +++ 2 files changed, 6 insertions(+) diff --cc src/or/c

[tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.2.5' into maint-0.2.8

2017-10-23 Thread nickm
commit 8cc147aa834b076233c5448992e145b908123908 Merge: 9a1b38546 15a699462 Author: Nick Mathewson Date: Mon Oct 23 09:04:56 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.8 changes/ticket23910 | 3 +++ src/or/config.c | 3 +++ 2 files changed, 6 insertions(+) diff --cc src/or/c

[tor-commits] [tor/maint-0.2.9] Merge branch 'maint-0.2.5' into maint-0.2.8

2017-10-23 Thread nickm
commit 8cc147aa834b076233c5448992e145b908123908 Merge: 9a1b38546 15a699462 Author: Nick Mathewson Date: Mon Oct 23 09:04:56 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.8 changes/ticket23910 | 3 +++ src/or/config.c | 3 +++ 2 files changed, 6 insertions(+) diff --cc src/or/c

[tor-commits] [tor/maint-0.2.5] dirauth: Add bastet to the default authorities

2017-10-23 Thread nickm
commit 15a699462dbf32df78cd187e013063450b989c15 Author: David Goulet Date: Thu Oct 19 16:08:43 2017 -0400 dirauth: Add bastet to the default authorities Fixes #23910 Based on a patch by dgoulet; backported to 0.2.5 --- changes/ticket23910 | 3 +++ src/or/config.c | 3

[tor-commits] [tor/release-0.3.0] Merge branch 'maint-0.2.9' into maint-0.3.0

2017-10-23 Thread nickm
commit 783e458c07be5f3f3539b1420e2a51f8b4efe04a Merge: 74e8fd22c c958fda6e Author: Nick Mathewson Date: Mon Oct 23 08:59:11 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/longclaw_23592 | 3 +++ src/or/config.c| 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)

[tor-commits] [tor/release-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.0

2017-10-23 Thread nickm
commit 783e458c07be5f3f3539b1420e2a51f8b4efe04a Merge: 74e8fd22c c958fda6e Author: Nick Mathewson Date: Mon Oct 23 08:59:11 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/longclaw_23592 | 3 +++ src/or/config.c| 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)

[tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.2.5' into maint-0.2.8

2017-10-23 Thread nickm
commit 9a1b385462556b36dc08265eb9d96958e9d2ed29 Merge: 6f87a8589 5d219ecf9 Author: Nick Mathewson Date: Mon Oct 23 08:58:28 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.8 changes/longclaw_23592 | 3 +++ src/or/config.c| 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)

[tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.3.0' into maint-0.3.1

2017-10-23 Thread nickm
commit df57d1e0c0e3e19dc4963391ad7f80ead3ab4f0d Merge: b68de63eb 783e458c0 Author: Nick Mathewson Date: Mon Oct 23 08:59:11 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/longclaw_23592 | 3 +++ src/or/config.c| 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)

[tor-commits] [tor/release-0.3.0] Update Longclaw's IP address; fixes 23592.

2017-10-23 Thread nickm
commit 5d219ecf98ff8b6a47fcb5fac5c511cd0b20bc86 Author: Nick Mathewson Date: Tue Oct 17 13:59:00 2017 -0400 Update Longclaw's IP address; fixes 23592. --- changes/longclaw_23592 | 3 +++ src/or/config.c| 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/changes/lo

[tor-commits] [tor/release-0.3.1] Merge branch 'maint-0.3.1' into release-0.3.1

2017-10-23 Thread nickm
commit 2fee12a96aa8fd09872d04da05e8bcc86dbe16d1 Merge: 919286be0 df57d1e0c Author: Nick Mathewson Date: Mon Oct 23 08:59:11 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 changes/longclaw_23592 | 3 +++ src/or/config.c| 2 +- 2 files changed, 4 insertions(+), 1 deletion(

[tor-commits] [tor/release-0.3.1] Merge branch 'maint-0.2.5' into maint-0.2.8

2017-10-23 Thread nickm
commit 9a1b385462556b36dc08265eb9d96958e9d2ed29 Merge: 6f87a8589 5d219ecf9 Author: Nick Mathewson Date: Mon Oct 23 08:58:28 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.8 changes/longclaw_23592 | 3 +++ src/or/config.c| 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)

[tor-commits] [tor/release-0.3.1] Merge branch 'maint-0.2.8' into maint-0.2.9

2017-10-23 Thread nickm
commit c958fda6e29265b12b987ee8445873c25629ae71 Merge: 132e2f69b 9a1b38546 Author: Nick Mathewson Date: Mon Oct 23 08:59:11 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/longclaw_23592 | 3 +++ src/or/config.c| 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)

[tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.2.9' into maint-0.3.0

2017-10-23 Thread nickm
commit 783e458c07be5f3f3539b1420e2a51f8b4efe04a Merge: 74e8fd22c c958fda6e Author: Nick Mathewson Date: Mon Oct 23 08:59:11 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/longclaw_23592 | 3 +++ src/or/config.c| 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)

[tor-commits] [tor/maint-0.3.2] Merge branch 'maint-0.2.8' into maint-0.2.9

2017-10-23 Thread nickm
commit c958fda6e29265b12b987ee8445873c25629ae71 Merge: 132e2f69b 9a1b38546 Author: Nick Mathewson Date: Mon Oct 23 08:59:11 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/longclaw_23592 | 3 +++ src/or/config.c| 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)

[tor-commits] [tor/release-0.3.1] Update Longclaw's IP address; fixes 23592.

2017-10-23 Thread nickm
commit 5d219ecf98ff8b6a47fcb5fac5c511cd0b20bc86 Author: Nick Mathewson Date: Tue Oct 17 13:59:00 2017 -0400 Update Longclaw's IP address; fixes 23592. --- changes/longclaw_23592 | 3 +++ src/or/config.c| 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/changes/lo

[tor-commits] [tor/release-0.3.0] Merge branch 'maint-0.2.5' into maint-0.2.8

2017-10-23 Thread nickm
commit 9a1b385462556b36dc08265eb9d96958e9d2ed29 Merge: 6f87a8589 5d219ecf9 Author: Nick Mathewson Date: Mon Oct 23 08:58:28 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.8 changes/longclaw_23592 | 3 +++ src/or/config.c| 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)

[tor-commits] [tor/release-0.3.2] Update Longclaw's IP address; fixes 23592.

2017-10-23 Thread nickm
commit 5d219ecf98ff8b6a47fcb5fac5c511cd0b20bc86 Author: Nick Mathewson Date: Tue Oct 17 13:59:00 2017 -0400 Update Longclaw's IP address; fixes 23592. --- changes/longclaw_23592 | 3 +++ src/or/config.c| 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/changes/lo

[tor-commits] [tor/release-0.3.0] Merge branch 'maint-0.2.8' into maint-0.2.9

2017-10-23 Thread nickm
commit c958fda6e29265b12b987ee8445873c25629ae71 Merge: 132e2f69b 9a1b38546 Author: Nick Mathewson Date: Mon Oct 23 08:59:11 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/longclaw_23592 | 3 +++ src/or/config.c| 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)

[tor-commits] [tor/release-0.3.0] Merge branch 'maint-0.3.0' into release-0.3.0

2017-10-23 Thread nickm
commit 385a44bac5de14aa0fab0808f5d1516d7cce4d3a Merge: bea47fde5 783e458c0 Author: Nick Mathewson Date: Mon Oct 23 08:59:11 2017 -0400 Merge branch 'maint-0.3.0' into release-0.3.0 changes/longclaw_23592 | 3 +++ src/or/config.c| 2 +- 2 files changed, 4 insertions(+), 1 deletion(

[tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2

2017-10-23 Thread nickm
commit b8dedaee743c7368664d63a77167b3ba82ff0b81 Merge: 578eead1c df57d1e0c Author: Nick Mathewson Date: Mon Oct 23 08:59:11 2017 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/longclaw_23592 | 3 +++ src/or/config.c| 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)

[tor-commits] [tor/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2

2017-10-23 Thread nickm
commit b8dedaee743c7368664d63a77167b3ba82ff0b81 Merge: 578eead1c df57d1e0c Author: Nick Mathewson Date: Mon Oct 23 08:59:11 2017 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/longclaw_23592 | 3 +++ src/or/config.c| 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)

[tor-commits] [tor/master] Merge branch 'maint-0.3.0' into maint-0.3.1

2017-10-23 Thread nickm
commit df57d1e0c0e3e19dc4963391ad7f80ead3ab4f0d Merge: b68de63eb 783e458c0 Author: Nick Mathewson Date: Mon Oct 23 08:59:11 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/longclaw_23592 | 3 +++ src/or/config.c| 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)

[tor-commits] [tor/release-0.3.1] Merge branch 'maint-0.3.0' into maint-0.3.1

2017-10-23 Thread nickm
commit df57d1e0c0e3e19dc4963391ad7f80ead3ab4f0d Merge: b68de63eb 783e458c0 Author: Nick Mathewson Date: Mon Oct 23 08:59:11 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/longclaw_23592 | 3 +++ src/or/config.c| 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)

[tor-commits] [tor/master] Update Longclaw's IP address; fixes 23592.

2017-10-23 Thread nickm
commit 5d219ecf98ff8b6a47fcb5fac5c511cd0b20bc86 Author: Nick Mathewson Date: Tue Oct 17 13:59:00 2017 -0400 Update Longclaw's IP address; fixes 23592. --- changes/longclaw_23592 | 3 +++ src/or/config.c| 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/changes/lo

[tor-commits] [tor/master] Merge branch 'maint-0.3.2'

2017-10-23 Thread nickm
commit 97046436b20dbba1258267e0a7bd0c5b02e125d4 Merge: c018aa819 b8dedaee7 Author: Nick Mathewson Date: Mon Oct 23 08:59:12 2017 -0400 Merge branch 'maint-0.3.2' changes/longclaw_23592 | 3 +++ src/or/config.c| 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) ___

[tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.2.8' into maint-0.2.9

2017-10-23 Thread nickm
commit c958fda6e29265b12b987ee8445873c25629ae71 Merge: 132e2f69b 9a1b38546 Author: Nick Mathewson Date: Mon Oct 23 08:59:11 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/longclaw_23592 | 3 +++ src/or/config.c| 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)

[tor-commits] [tor/release-0.2.9] Merge branch 'maint-0.2.9' into release-0.2.9

2017-10-23 Thread nickm
commit b1445b19e432ec87ea5092366b4e4fbbd5bf5c9b Merge: d818f1e86 c958fda6e Author: Nick Mathewson Date: Mon Oct 23 08:59:11 2017 -0400 Merge branch 'maint-0.2.9' into release-0.2.9 changes/longclaw_23592 | 3 +++ src/or/config.c| 2 +- 2 files changed, 4 insertions(+), 1 deletion(

[tor-commits] [tor/release-0.2.9] Update Longclaw's IP address; fixes 23592.

2017-10-23 Thread nickm
commit 5d219ecf98ff8b6a47fcb5fac5c511cd0b20bc86 Author: Nick Mathewson Date: Tue Oct 17 13:59:00 2017 -0400 Update Longclaw's IP address; fixes 23592. --- changes/longclaw_23592 | 3 +++ src/or/config.c| 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/changes/lo

[tor-commits] [tor/release-0.2.8] Update Longclaw's IP address; fixes 23592.

2017-10-23 Thread nickm
commit 5d219ecf98ff8b6a47fcb5fac5c511cd0b20bc86 Author: Nick Mathewson Date: Tue Oct 17 13:59:00 2017 -0400 Update Longclaw's IP address; fixes 23592. --- changes/longclaw_23592 | 3 +++ src/or/config.c| 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/changes/lo

[tor-commits] [tor/release-0.2.5] Merge branch 'maint-0.2.5' into release-0.2.5

2017-10-23 Thread nickm
commit 533ae56fcf57e8120549f6026677923fc66e9e26 Merge: 558eafe56 5d219ecf9 Author: Nick Mathewson Date: Mon Oct 23 08:57:22 2017 -0400 Merge branch 'maint-0.2.5' into release-0.2.5 changes/longclaw_23592 | 3 +++ src/or/config.c| 2 +- 2 files changed, 4 insertions(+), 1 deletion(

[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.0

2017-10-23 Thread nickm
commit 783e458c07be5f3f3539b1420e2a51f8b4efe04a Merge: 74e8fd22c c958fda6e Author: Nick Mathewson Date: Mon Oct 23 08:59:11 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/longclaw_23592 | 3 +++ src/or/config.c| 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)

[tor-commits] [tor/master] Merge branch 'maint-0.2.5' into maint-0.2.8

2017-10-23 Thread nickm
commit 9a1b385462556b36dc08265eb9d96958e9d2ed29 Merge: 6f87a8589 5d219ecf9 Author: Nick Mathewson Date: Mon Oct 23 08:58:28 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.8 changes/longclaw_23592 | 3 +++ src/or/config.c| 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)

[tor-commits] [tor/release-0.2.5] Update Longclaw's IP address; fixes 23592.

2017-10-23 Thread nickm
commit 5d219ecf98ff8b6a47fcb5fac5c511cd0b20bc86 Author: Nick Mathewson Date: Tue Oct 17 13:59:00 2017 -0400 Update Longclaw's IP address; fixes 23592. --- changes/longclaw_23592 | 3 +++ src/or/config.c| 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/changes/lo

[tor-commits] [tor/maint-0.3.2] Merge branch 'maint-0.2.9' into maint-0.3.0

2017-10-23 Thread nickm
commit 783e458c07be5f3f3539b1420e2a51f8b4efe04a Merge: 74e8fd22c c958fda6e Author: Nick Mathewson Date: Mon Oct 23 08:59:11 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/longclaw_23592 | 3 +++ src/or/config.c| 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)

[tor-commits] [tor/master] Merge branch 'maint-0.2.8' into maint-0.2.9

2017-10-23 Thread nickm
commit c958fda6e29265b12b987ee8445873c25629ae71 Merge: 132e2f69b 9a1b38546 Author: Nick Mathewson Date: Mon Oct 23 08:59:11 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/longclaw_23592 | 3 +++ src/or/config.c| 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)

[tor-commits] [tor/release-0.2.9] Merge branch 'maint-0.2.8' into maint-0.2.9

2017-10-23 Thread nickm
commit c958fda6e29265b12b987ee8445873c25629ae71 Merge: 132e2f69b 9a1b38546 Author: Nick Mathewson Date: Mon Oct 23 08:59:11 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/longclaw_23592 | 3 +++ src/or/config.c| 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)

[tor-commits] [tor/maint-0.3.0] Merge branch 'maint-0.2.5' into maint-0.2.8

2017-10-23 Thread nickm
commit 9a1b385462556b36dc08265eb9d96958e9d2ed29 Merge: 6f87a8589 5d219ecf9 Author: Nick Mathewson Date: Mon Oct 23 08:58:28 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.8 changes/longclaw_23592 | 3 +++ src/or/config.c| 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)

[tor-commits] [tor/maint-0.3.2] Merge branch 'maint-0.2.5' into maint-0.2.8

2017-10-23 Thread nickm
commit 9a1b385462556b36dc08265eb9d96958e9d2ed29 Merge: 6f87a8589 5d219ecf9 Author: Nick Mathewson Date: Mon Oct 23 08:58:28 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.8 changes/longclaw_23592 | 3 +++ src/or/config.c| 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)

[tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.0

2017-10-23 Thread nickm
commit 783e458c07be5f3f3539b1420e2a51f8b4efe04a Merge: 74e8fd22c c958fda6e Author: Nick Mathewson Date: Mon Oct 23 08:59:11 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/longclaw_23592 | 3 +++ src/or/config.c| 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)

<    1   2   3   4   >