[tor-commits] [tor/release-0.3.0] bump version in the other places :/

commit 5325e7ccab70383a629019323ba01d2c9215b5f4 Author: Nick Mathewson Date: Tue Oct 24 09:11:17 2017 -0400 bump version in the other places :/ --- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 2 files changed, 2

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

commit 912ebf165f6a3e7385118cf78a4107f25b0ad5de Merge: d4befa035 743eee493 Author: Nick Mathewson Date: Tue Oct 24 09:10:04 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.8 "ours" merge to avoid version bump

[tor-commits] [tor/release-0.3.0] bump to 0.2.5.15

commit 743eee4930e7f5e37e18cc0f81e86133ab62885f Author: Nick Mathewson Date: Tue Oct 24 09:09:00 2017 -0400 bump to 0.2.5.15 --- configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 3

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

commit 302b5f577dc0840fd9f738d160ef14b88a71b67f Merge: d913a7317 725f23710 Author: Nick Mathewson Date: Tue Oct 24 09:10:24 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 "ours" merge to avoid version bump

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

commit a574ab8e2f78e75db45521d185b1a21262489995 Merge: 3353942fd 725f23710 Author: Nick Mathewson Date: Tue Oct 24 09:10:42 2017 -0400 Merge branch 'maint-0.2.9' into release-0.2.9 configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

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

commit 4d308789e2133261e30b0dac8c31a5517ac2fd3f Merge: 0ad731710 7bebd1b02 Author: Nick Mathewson Date: Tue Oct 24 09:11:38 2017 -0400 Merge branch 'maint-0.3.0' into release-0.3.0 contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2

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

commit 38a58076e921d561fa1e488a4b0f983b12300ca4 Merge: cbb41ddfe 302b5f577 Author: Nick Mathewson Date: Tue Oct 24 09:10:30 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 "ours" merge to avoid version bump

[tor-commits] [tor/release-0.3.0] bump to 0.3.0.12

commit d913a7317bf205d580cde70a0b58010295fe6c4c Author: Nick Mathewson Date: Tue Oct 24 09:09:35 2017 -0400 bump to 0.3.0.12 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 3f36da739..60d4cc784

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

commit 7bebd1b02551bb232fef73aa7f81c11ed6125a25 Merge: 5325e7cca 552b62028 Author: Nick Mathewson Date: Tue Oct 24 09:11:24 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 "ours" merge to avoid version bump

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

commit 912ebf165f6a3e7385118cf78a4107f25b0ad5de Merge: d4befa035 743eee493 Author: Nick Mathewson Date: Tue Oct 24 09:10:04 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.8 "ours" merge to avoid version bump

[tor-commits] [tor/release-0.2.9] bump to 0.2.9.13

commit 09d2ae562ac47cfcb92ce5f66bb67ee3b5072059 Author: Nick Mathewson Date: Tue Oct 24 09:09:26 2017 -0400 bump to 0.2.9.13 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 76140cbd1..786b4b095

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

commit 122a7f8848785e3cefef812749c7ec1844b26402 Merge: cce1a6efa 990322fca Author: Nick Mathewson Date: Tue Oct 24 09:11:38 2017 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 ___ tor-commits mailing list

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

commit 990322fca450d2230067a3035468c5ac7168e760 Merge: 38a58076e 7bebd1b02 Author: Nick Mathewson Date: Tue Oct 24 09:11:33 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 "ours" merge to avoid version bump

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

commit 725f2371042b36c151a42e575a5b319d3820126c Merge: 09d2ae562 912ebf165 Author: Nick Mathewson Date: Tue Oct 24 09:10:17 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 "ours" merge to avoid version bump

[tor-commits] [tor/master] bump version in the other places :/

commit 5325e7ccab70383a629019323ba01d2c9215b5f4 Author: Nick Mathewson Date: Tue Oct 24 09:11:17 2017 -0400 bump version in the other places :/ --- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 2 files changed, 2

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

commit cce1a6efa6adbb90566fc6567c82c4410cd76bf9 Merge: 0d4addfc7 38a58076e Author: Nick Mathewson Date: Tue Oct 24 09:10:37 2017 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 "ours" merge to avoid version bump

[tor-commits] [tor/release-0.2.9] bump to 0.2.8.16

commit d4befa035d5caa7a3c71b62cb3f613c36060c9e0 Author: Nick Mathewson Date: Tue Oct 24 09:09:10 2017 -0400 bump to 0.2.8.16 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 55ace93cb..79af3d4b6

[tor-commits] [tor/release-0.2.9] bump to 0.2.5.15

commit 743eee4930e7f5e37e18cc0f81e86133ab62885f Author: Nick Mathewson Date: Tue Oct 24 09:09:00 2017 -0400 bump to 0.2.5.15 --- configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 3

[tor-commits] [tor/master] bump version in the other places :/

commit 552b620280d481ec9d5845d1c6584778545d1f85 Author: Nick Mathewson Date: Tue Oct 24 09:11:07 2017 -0400 bump version in the other places :/ --- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 2 files changed, 2

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

commit 51de3a1c15ddc36e7c7e790224409121c036b31f Merge: abbd6a36f cce1a6efa Author: Nick Mathewson Date: Tue Oct 24 09:10:43 2017 -0400 Merge branch 'maint-0.3.2' ___ tor-commits mailing list

[tor-commits] [tor/master] bump to 0.3.1.8

commit cbb41ddfef3398e2aefef952b491610864f9670d Author: Nick Mathewson Date: Tue Oct 24 09:09:50 2017 -0400 bump to 0.3.1.8 --- configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 3 files

[tor-commits] [tor/release-0.2.5] bump to 0.2.5.15

commit 743eee4930e7f5e37e18cc0f81e86133ab62885f Author: Nick Mathewson Date: Tue Oct 24 09:09:00 2017 -0400 bump to 0.2.5.15 --- configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 3

[tor-commits] [tor/release-0.2.8] bump to 0.2.8.16

commit d4befa035d5caa7a3c71b62cb3f613c36060c9e0 Author: Nick Mathewson Date: Tue Oct 24 09:09:10 2017 -0400 bump to 0.2.8.16 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 55ace93cb..79af3d4b6

[tor-commits] [tor/release-0.2.8] bump to 0.2.5.15

commit 743eee4930e7f5e37e18cc0f81e86133ab62885f Author: Nick Mathewson Date: Tue Oct 24 09:09:00 2017 -0400 bump to 0.2.5.15 --- configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 3

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

commit 350fecfafe74d08be54d8162a01ab79dbe84d53a Merge: 51de3a1c1 122a7f884 Author: Nick Mathewson Date: Tue Oct 24 09:11:38 2017 -0400 Merge branch 'maint-0.3.2' ___ tor-commits mailing list tor-commits@lists.torproject.org

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

commit 912ebf165f6a3e7385118cf78a4107f25b0ad5de Merge: d4befa035 743eee493 Author: Nick Mathewson Date: Tue Oct 24 09:10:04 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.8 "ours" merge to avoid version bump

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

commit 302b5f577dc0840fd9f738d160ef14b88a71b67f Merge: d913a7317 725f23710 Author: Nick Mathewson Date: Tue Oct 24 09:10:24 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 "ours" merge to avoid version bump

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

commit 078604630dad7edc57cc9378102de65f06586efd Merge: 8669a1ea5 743eee493 Author: Nick Mathewson Date: Tue Oct 24 09:10:42 2017 -0400 Merge branch 'maint-0.2.5' into release-0.2.5 configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2

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

commit 725f2371042b36c151a42e575a5b319d3820126c Merge: 09d2ae562 912ebf165 Author: Nick Mathewson Date: Tue Oct 24 09:10:17 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 "ours" merge to avoid version bump

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

commit 7bebd1b02551bb232fef73aa7f81c11ed6125a25 Merge: 5325e7cca 552b62028 Author: Nick Mathewson Date: Tue Oct 24 09:11:24 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 "ours" merge to avoid version bump

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

commit 2182bb827d271d9854ad0f93958933c4bee8899e Merge: 99756033f 912ebf165 Author: Nick Mathewson Date: Tue Oct 24 09:10:42 2017 -0400 Merge branch 'maint-0.2.8' into release-0.2.8 configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

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

commit 912ebf165f6a3e7385118cf78a4107f25b0ad5de Merge: d4befa035 743eee493 Author: Nick Mathewson Date: Tue Oct 24 09:10:04 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.8 "ours" merge to avoid version bump

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

commit 7bebd1b02551bb232fef73aa7f81c11ed6125a25 Merge: 5325e7cca 552b62028 Author: Nick Mathewson Date: Tue Oct 24 09:11:24 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 "ours" merge to avoid version bump

[tor-commits] [tor/master] bump to 0.3.0.12

commit d913a7317bf205d580cde70a0b58010295fe6c4c Author: Nick Mathewson Date: Tue Oct 24 09:09:35 2017 -0400 bump to 0.3.0.12 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 3f36da739..60d4cc784

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

commit 725f2371042b36c151a42e575a5b319d3820126c Merge: 09d2ae562 912ebf165 Author: Nick Mathewson Date: Tue Oct 24 09:10:17 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 "ours" merge to avoid version bump

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

commit cce1a6efa6adbb90566fc6567c82c4410cd76bf9 Merge: 0d4addfc7 38a58076e Author: Nick Mathewson Date: Tue Oct 24 09:10:37 2017 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 "ours" merge to avoid version bump

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

commit 122a7f8848785e3cefef812749c7ec1844b26402 Merge: cce1a6efa 990322fca Author: Nick Mathewson Date: Tue Oct 24 09:11:38 2017 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 ___ tor-commits mailing list

[tor-commits] [tor/maint-0.3.2] bump to 0.2.8.16

commit d4befa035d5caa7a3c71b62cb3f613c36060c9e0 Author: Nick Mathewson Date: Tue Oct 24 09:09:10 2017 -0400 bump to 0.2.8.16 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 55ace93cb..79af3d4b6

[tor-commits] [tor/maint-0.3.2] bump to 0.3.0.12

commit d913a7317bf205d580cde70a0b58010295fe6c4c Author: Nick Mathewson Date: Tue Oct 24 09:09:35 2017 -0400 bump to 0.3.0.12 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 3f36da739..60d4cc784

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

commit 38a58076e921d561fa1e488a4b0f983b12300ca4 Merge: cbb41ddfe 302b5f577 Author: Nick Mathewson Date: Tue Oct 24 09:10:30 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 "ours" merge to avoid version bump

[tor-commits] [tor/maint-0.3.2] bump to 0.2.9.13

commit 09d2ae562ac47cfcb92ce5f66bb67ee3b5072059 Author: Nick Mathewson Date: Tue Oct 24 09:09:26 2017 -0400 bump to 0.2.9.13 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 76140cbd1..786b4b095

[tor-commits] [tor/master] bump to 0.2.9.13

commit 09d2ae562ac47cfcb92ce5f66bb67ee3b5072059 Author: Nick Mathewson Date: Tue Oct 24 09:09:26 2017 -0400 bump to 0.2.9.13 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 76140cbd1..786b4b095

[tor-commits] [tor/maint-0.3.2] bump to 0.3.1.8

commit cbb41ddfef3398e2aefef952b491610864f9670d Author: Nick Mathewson Date: Tue Oct 24 09:09:50 2017 -0400 bump to 0.3.1.8 --- configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 3 files

[tor-commits] [tor/master] bump to 0.2.5.15

commit 743eee4930e7f5e37e18cc0f81e86133ab62885f Author: Nick Mathewson Date: Tue Oct 24 09:09:00 2017 -0400 bump to 0.2.5.15 --- configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 3

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

commit 990322fca450d2230067a3035468c5ac7168e760 Merge: 38a58076e 7bebd1b02 Author: Nick Mathewson Date: Tue Oct 24 09:11:33 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 "ours" merge to avoid version bump

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

commit 990322fca450d2230067a3035468c5ac7168e760 Merge: 38a58076e 7bebd1b02 Author: Nick Mathewson Date: Tue Oct 24 09:11:33 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 "ours" merge to avoid version bump

[tor-commits] [tor/master] bump to 0.2.8.16

commit d4befa035d5caa7a3c71b62cb3f613c36060c9e0 Author: Nick Mathewson Date: Tue Oct 24 09:09:10 2017 -0400 bump to 0.2.8.16 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 55ace93cb..79af3d4b6

[tor-commits] [tor/maint-0.3.2] bump to 0.2.5.15

commit 743eee4930e7f5e37e18cc0f81e86133ab62885f Author: Nick Mathewson Date: Tue Oct 24 09:09:00 2017 -0400 bump to 0.2.5.15 --- configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 3

[tor-commits] [tor/maint-0.3.2] bump version in the other places :/

commit 5325e7ccab70383a629019323ba01d2c9215b5f4 Author: Nick Mathewson Date: Tue Oct 24 09:11:17 2017 -0400 bump version in the other places :/ --- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 2 files changed, 2

[tor-commits] [tor/maint-0.3.2] bump version in the other places :/

commit 552b620280d481ec9d5845d1c6584778545d1f85 Author: Nick Mathewson Date: Tue Oct 24 09:11:07 2017 -0400 bump version in the other places :/ --- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 2 files changed, 2

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

commit 302b5f577dc0840fd9f738d160ef14b88a71b67f Merge: d913a7317 725f23710 Author: Nick Mathewson Date: Tue Oct 24 09:10:24 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 "ours" merge to avoid version bump

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

commit 912ebf165f6a3e7385118cf78a4107f25b0ad5de Merge: d4befa035 743eee493 Author: Nick Mathewson Date: Tue Oct 24 09:10:04 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.8 "ours" merge to avoid version bump

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

commit 7bebd1b02551bb232fef73aa7f81c11ed6125a25 Merge: 5325e7cca 552b62028 Author: Nick Mathewson Date: Tue Oct 24 09:11:24 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 "ours" merge to avoid version bump

[tor-commits] [tor/maint-0.3.1] bump to 0.2.8.16

commit d4befa035d5caa7a3c71b62cb3f613c36060c9e0 Author: Nick Mathewson Date: Tue Oct 24 09:09:10 2017 -0400 bump to 0.2.8.16 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 55ace93cb..79af3d4b6

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

commit 912ebf165f6a3e7385118cf78a4107f25b0ad5de Merge: d4befa035 743eee493 Author: Nick Mathewson Date: Tue Oct 24 09:10:04 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.8 "ours" merge to avoid version bump

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

commit 38a58076e921d561fa1e488a4b0f983b12300ca4 Merge: cbb41ddfe 302b5f577 Author: Nick Mathewson Date: Tue Oct 24 09:10:30 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 "ours" merge to avoid version bump

[tor-commits] [tor/maint-0.3.0] bump to 0.2.8.16

commit d4befa035d5caa7a3c71b62cb3f613c36060c9e0 Author: Nick Mathewson Date: Tue Oct 24 09:09:10 2017 -0400 bump to 0.2.8.16 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 55ace93cb..79af3d4b6

[tor-commits] [tor/maint-0.3.1] bump to 0.2.9.13

commit 09d2ae562ac47cfcb92ce5f66bb67ee3b5072059 Author: Nick Mathewson Date: Tue Oct 24 09:09:26 2017 -0400 bump to 0.2.9.13 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 76140cbd1..786b4b095

[tor-commits] [tor/maint-0.3.0] bump to 0.2.9.13

commit 09d2ae562ac47cfcb92ce5f66bb67ee3b5072059 Author: Nick Mathewson Date: Tue Oct 24 09:09:26 2017 -0400 bump to 0.2.9.13 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 76140cbd1..786b4b095

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

commit 302b5f577dc0840fd9f738d160ef14b88a71b67f Merge: d913a7317 725f23710 Author: Nick Mathewson Date: Tue Oct 24 09:10:24 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 "ours" merge to avoid version bump

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

commit 7bebd1b02551bb232fef73aa7f81c11ed6125a25 Merge: 5325e7cca 552b62028 Author: Nick Mathewson Date: Tue Oct 24 09:11:24 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 "ours" merge to avoid version bump

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

commit 302b5f577dc0840fd9f738d160ef14b88a71b67f Merge: d913a7317 725f23710 Author: Nick Mathewson Date: Tue Oct 24 09:10:24 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 "ours" merge to avoid version bump

[tor-commits] [tor/maint-0.3.1] bump to 0.3.0.12

commit d913a7317bf205d580cde70a0b58010295fe6c4c Author: Nick Mathewson Date: Tue Oct 24 09:09:35 2017 -0400 bump to 0.3.0.12 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 3f36da739..60d4cc784

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

commit 912ebf165f6a3e7385118cf78a4107f25b0ad5de Merge: d4befa035 743eee493 Author: Nick Mathewson Date: Tue Oct 24 09:10:04 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.8 "ours" merge to avoid version bump

[tor-commits] [tor/maint-0.3.0] bump version in the other places :/

commit 5325e7ccab70383a629019323ba01d2c9215b5f4 Author: Nick Mathewson Date: Tue Oct 24 09:11:17 2017 -0400 bump version in the other places :/ --- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 2 files changed, 2

[tor-commits] [tor/maint-0.3.1] bump to 0.3.1.8

commit cbb41ddfef3398e2aefef952b491610864f9670d Author: Nick Mathewson Date: Tue Oct 24 09:09:50 2017 -0400 bump to 0.3.1.8 --- configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 3 files

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

commit 725f2371042b36c151a42e575a5b319d3820126c Merge: 09d2ae562 912ebf165 Author: Nick Mathewson Date: Tue Oct 24 09:10:17 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 "ours" merge to avoid version bump

[tor-commits] [tor/maint-0.3.1] bump version in the other places :/

commit 5325e7ccab70383a629019323ba01d2c9215b5f4 Author: Nick Mathewson Date: Tue Oct 24 09:11:17 2017 -0400 bump version in the other places :/ --- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 2 files changed, 2

[tor-commits] [tor/maint-0.3.1] bump to 0.2.5.15

commit 743eee4930e7f5e37e18cc0f81e86133ab62885f Author: Nick Mathewson Date: Tue Oct 24 09:09:00 2017 -0400 bump to 0.2.5.15 --- configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 3

[tor-commits] [tor/maint-0.3.0] bump version in the other places :/

commit 552b620280d481ec9d5845d1c6584778545d1f85 Author: Nick Mathewson Date: Tue Oct 24 09:11:07 2017 -0400 bump version in the other places :/ --- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 2 files changed, 2

[tor-commits] [tor/maint-0.3.0] bump to 0.3.0.12

commit d913a7317bf205d580cde70a0b58010295fe6c4c Author: Nick Mathewson Date: Tue Oct 24 09:09:35 2017 -0400 bump to 0.3.0.12 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 3f36da739..60d4cc784

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

commit 725f2371042b36c151a42e575a5b319d3820126c Merge: 09d2ae562 912ebf165 Author: Nick Mathewson Date: Tue Oct 24 09:10:17 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 "ours" merge to avoid version bump

[tor-commits] [tor/maint-0.3.1] bump version in the other places :/

commit 552b620280d481ec9d5845d1c6584778545d1f85 Author: Nick Mathewson Date: Tue Oct 24 09:11:07 2017 -0400 bump version in the other places :/ --- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 2 files changed, 2

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

commit 725f2371042b36c151a42e575a5b319d3820126c Merge: 09d2ae562 912ebf165 Author: Nick Mathewson Date: Tue Oct 24 09:10:17 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 "ours" merge to avoid version bump

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

commit 912ebf165f6a3e7385118cf78a4107f25b0ad5de Merge: d4befa035 743eee493 Author: Nick Mathewson Date: Tue Oct 24 09:10:04 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.8 "ours" merge to avoid version bump

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

commit 912ebf165f6a3e7385118cf78a4107f25b0ad5de Merge: d4befa035 743eee493 Author: Nick Mathewson Date: Tue Oct 24 09:10:04 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.8 "ours" merge to avoid version bump

[tor-commits] [tor/maint-0.2.8] bump to 0.2.5.15

commit 743eee4930e7f5e37e18cc0f81e86133ab62885f Author: Nick Mathewson Date: Tue Oct 24 09:09:00 2017 -0400 bump to 0.2.5.15 --- configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 3

[tor-commits] [tor/maint-0.2.5] bump to 0.2.5.15

commit 743eee4930e7f5e37e18cc0f81e86133ab62885f Author: Nick Mathewson Date: Tue Oct 24 09:09:00 2017 -0400 bump to 0.2.5.15 --- configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 3

[tor-commits] [tor/maint-0.2.9] bump to 0.2.9.13

commit 09d2ae562ac47cfcb92ce5f66bb67ee3b5072059 Author: Nick Mathewson Date: Tue Oct 24 09:09:26 2017 -0400 bump to 0.2.9.13 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 76140cbd1..786b4b095

[tor-commits] [tor/maint-0.2.9] bump version in the other places :/

commit 552b620280d481ec9d5845d1c6584778545d1f85 Author: Nick Mathewson Date: Tue Oct 24 09:11:07 2017 -0400 bump version in the other places :/ --- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 2 files changed, 2

[tor-commits] [tor/maint-0.2.9] bump to 0.2.8.16

commit d4befa035d5caa7a3c71b62cb3f613c36060c9e0 Author: Nick Mathewson Date: Tue Oct 24 09:09:10 2017 -0400 bump to 0.2.8.16 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 55ace93cb..79af3d4b6

[tor-commits] [tor/maint-0.2.8] bump to 0.2.8.16

commit d4befa035d5caa7a3c71b62cb3f613c36060c9e0 Author: Nick Mathewson Date: Tue Oct 24 09:09:10 2017 -0400 bump to 0.2.8.16 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 55ace93cb..79af3d4b6

[tor-commits] [tor/maint-0.2.9] bump to 0.2.5.15

commit 743eee4930e7f5e37e18cc0f81e86133ab62885f Author: Nick Mathewson Date: Tue Oct 24 09:09:00 2017 -0400 bump to 0.2.5.15 --- configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 3

[tor-commits] [tor/maint-0.3.0] bump to 0.2.5.15

commit 743eee4930e7f5e37e18cc0f81e86133ab62885f Author: Nick Mathewson Date: Tue Oct 24 09:09:00 2017 -0400 bump to 0.2.5.15 --- configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 3

[tor-commits] [tor/release-0.3.1] add a date

commit af51ac47e0f550339fc25a4b62d7b68a716f8b56 Author: Nick Mathewson Date: Tue Oct 24 08:53:44 2017 -0400 add a date --- ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 09a8efdbf..e4d2e1bba 100644 ---

[tor-commits] [tor/release-0.3.0] Warn that 030 will become deprecated next january.

commit 2244838ec06260fade1dadf76c845c40b441df11 Author: Nick Mathewson Date: Tue Oct 24 09:05:47 2017 -0400 Warn that 030 will become deprecated next january. --- ChangeLog | 4 1 file changed, 4 insertions(+) diff --git a/ChangeLog b/ChangeLog index

[tor-commits] [tor/release-0.2.8] Warn that 028 will become deprecated next january.

commit 99756033f785996413f0b68d7c08c40c355e0c0a Author: Nick Mathewson Date: Tue Oct 24 09:05:40 2017 -0400 Warn that 028 will become deprecated next january. --- ChangeLog | 4 1 file changed, 4 insertions(+) diff --git a/ChangeLog b/ChangeLog index

[tor-commits] [tor/release-0.3.0] Begin a changelog for 0.3.0.12

commit 658cd486baa9ae8a7e7cd011180e1b0c2e87a34f Author: Nick Mathewson Date: Tue Oct 24 08:53:18 2017 -0400 Begin a changelog for 0.3.0.12 --- ChangeLog | 54 +++ changes/bug22349 | 9

[tor-commits] [tor/release-0.2.5] begin a changelog for 0.2.5.15

commit 55c918e7d2f45af883e2b5f806cdbc51470f86a1 Author: Nick Mathewson Date: Tue Oct 24 09:01:43 2017 -0400 begin a changelog for 0.2.5.15 --- ChangeLog | 41 + changes/bug22636| 8

[tor-commits] [tor/release-0.2.5] Warn that 025 will become deprecated next may.

commit 8669a1ea50075a05d7f0f3b592748c76b44be10c Author: Nick Mathewson Date: Tue Oct 24 09:05:23 2017 -0400 Warn that 025 will become deprecated next may. --- ChangeLog | 4 1 file changed, 4 insertions(+) diff --git a/ChangeLog b/ChangeLog index

[tor-commits] [tor/release-0.2.8] Start an 0.2.8.16 changelog

commit 7db388c2210378b1ef7ab88bc37598c631b4eb7b Author: Nick Mathewson Date: Tue Oct 24 08:58:56 2017 -0400 Start an 0.2.8.16 changelog --- ChangeLog | 27 +++ changes/bug23690 | 5 - changes/geoip-october2017 |

[tor-commits] [tor/release-0.2.9] start a changelog for 0.2.9.13

commit 3353942fde7e3b6caedcf5f97d8fb40e6c171b34 Author: Nick Mathewson Date: Tue Oct 24 08:56:43 2017 -0400 start a changelog for 0.2.9.13 --- ChangeLog | 49 +++ changes/bug22349 | 9 -

[tor-commits] [tor/release-0.3.1] mention bastet in blurb

commit d5e3b6e6b7fc6266695b0b75f72895ebb26a0629 Author: Nick Mathewson Date: Tue Oct 24 08:44:59 2017 -0400 mention bastet in blurb --- ChangeLog | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index

[tor-commits] [tor/release-0.3.1] start on an 0.3.1.8 changelog

commit ce8d60674d43d4ac84fc6759290d9a43c1f732fc Author: Nick Mathewson Date: Tue Oct 24 08:42:22 2017 -0400 start on an 0.3.1.8 changelog --- ChangeLog | 55 +++ changes/bug23551 | 3 ---

[tor-commits] [torspec/master] Remove next-circuit.

commit 226a54418ca84446d1902f7abb9a89937476e5c8 Author: Tom Ritter Date: Fri Oct 20 11:55:36 2017 -0500 Remove next-circuit. It is not documented anywhere else, nor implemented. It is not clear if the TODO refers to the documentation of the feature, or the

[tor-commits] [torspec/master] Explain the PROTOCOLINFO command

commit 144f33690d523acad9cbe54af26e8dac83f1adb2 Author: Tom Ritter Date: Fri Oct 20 12:22:53 2017 -0500 Explain the PROTOCOLINFO command --- control-spec.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/control-spec.txt b/control-spec.txt index 78f02e7..555e625

[tor-commits] [torspec/master] Break up a paragraph into bullet points

commit c912116e9bc300a867a180364765bac10e9fd779 Author: Nick Mathewson Date: Tue Oct 24 08:31:08 2017 -0400 Break up a paragraph into bullet points Also, s/hexidecimal/hexadecimal/. --- control-spec.txt | 13 + 1 file changed, 9 insertions(+), 4

[tor-commits] [torspec/master] Merge remote-tracking branch 'tomrittervg/control-spec-editorial-1'

commit cc55d0a7296a521f6f2fd940480330e22e6ff5ab Merge: 4074b89 9e9d61b Author: Nick Mathewson Date: Tue Oct 24 08:28:29 2017 -0400 Merge remote-tracking branch 'tomrittervg/control-spec-editorial-1' control-spec.txt | 15 --- 1 file changed, 12

[tor-commits] [torspec/master] Add clarifications to the authenticaiton mechanisms

commit 9e9d61ba48c5ec6a854eef730a6cca8323c7a5f9 Author: Tom Ritter Date: Fri Oct 20 13:41:38 2017 -0500 Add clarifications to the authenticaiton mechanisms --- control-spec.txt | 9 + 1 file changed, 9 insertions(+) diff --git a/control-spec.txt b/control-spec.txt

[tor-commits] [tor/master] Have LOG_PROTOCOL_WARN call its own function

commit 48ee85e0c6c83c31693bc58ca4e8e91c8031421d Author: Nick Mathewson Date: Mon Oct 23 12:20:58 2017 -0400 Have LOG_PROTOCOL_WARN call its own function Also, make the function that implements LOG_PROTOCOL_WARN use a cached value of the desired loglevel,

<    1   2   3   >