May 2018 - tor-commits - lists.torproject.org

[tor/release-0.3.2] Merge branch 'maint-0.2.9' into maint-0.3.1
by nickm＠torproject.org 03 May '18

03 May '18

commit 6361a250f08421aa1e6db1093aaa488ee24ce77d Merge: 726f238b7 5227754b2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 3 13:38:54 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1

1 0

[tor/release-0.3.2] Merge remote-tracking branch 'catalyst-github/bug25936-029' into maint-0.2.9
by nickm＠torproject.org 03 May '18

03 May '18

commit 5227754b2f441c93da6436697a19841e9e71246f Merge: d465bd27e 31865b502 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 3 13:38:37 2018 -0400 Merge remote-tracking branch 'catalyst-github/bug25936-029' into maint-0.2.9 .travis.yml | 4 +++- Makefile.am | 9 +++++++++ 2 files changed, 12 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.1] Merge remote-tracking branch 'catalyst-github/bug25936-029' into maint-0.2.9
by nickm＠torproject.org 03 May '18

03 May '18

commit 5227754b2f441c93da6436697a19841e9e71246f Merge: d465bd27e 31865b502 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 3 13:38:37 2018 -0400 Merge remote-tracking branch 'catalyst-github/bug25936-029' into maint-0.2.9 .travis.yml | 4 +++- Makefile.am | 9 +++++++++ 2 files changed, 12 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.2] Merge branch 'bug25936-029' into bug25936-031
by nickm＠torproject.org 03 May '18

03 May '18

commit 59821050982a7e1c6906de61b6742546378e569c Merge: bb35405d2 31865b502 Author: Taylor Yu <catalyst(a)torproject.org> Date: Thu Apr 26 15:46:57 2018 -0500 Merge branch 'bug25936-029' into bug25936-031 .travis.yml | 4 +++- Makefile.am | 9 +++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --cc Makefile.am index 79d2e7852,f06d0e373..1a6d8e7d1 --- a/Makefile.am +++ b/Makefile.am @@@ -237,6 -217,11 +237,15 @@@ mostlyclean-local rm -rf $(top_builddir)/doc/doxygen … [View More]

1 0

[tor/release-0.3.1] Merge branch 'maint-0.3.1' into release-0.3.1
by nickm＠torproject.org 03 May '18

03 May '18

commit 8ddd84707e84836ecfd985647a4d5593bf151d35 Merge: 3bf89fb85 6361a250f Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 3 13:38:54 2018 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 .travis.yml | 4 +++- Makefile.am | 9 +++++++++ 2 files changed, 12 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.2] Show test-suite.log for distcheck on Travis CI
by nickm＠torproject.org 03 May '18

03 May '18

commit 31865b50295753706ff3a9eb598e080bb2167639 Author: Taylor Yu <catalyst(a)torproject.org> Date: Thu Apr 26 14:22:52 2018 -0500 Show test-suite.log for distcheck on Travis CI When Travis CI runs make distcheck, test-suite.log doesn't exist in the expected place. Add a new make target to show this file and use it when DISTCHECK=yes in .travis.yml. Fixes bug 25814; bug not in any released Tor. --- .travis.yml | 4 +++- Makefile.am | 9 +++++++++ 2 files … [View More]

1 0

[tor/release-0.3.2] Merge remote-tracking branch 'catalyst-github/bug25936-031' into maint-0.3.1
by nickm＠torproject.org 03 May '18

03 May '18

commit 726f238b723dfaa88df763bec7e923e99430ea87 Merge: 993e314c6 598210509 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 3 13:38:46 2018 -0400 Merge remote-tracking branch 'catalyst-github/bug25936-031' into maint-0.3.1 .travis.yml | 4 +++- Makefile.am | 9 +++++++++ 2 files changed, 12 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
by nickm＠torproject.org 03 May '18

03 May '18

commit be5b4415c2dce243a6249e6ca14b65423c9b0746 Merge: 246765342 6361a250f Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 3 13:38:54 2018 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 .travis.yml | 4 +++- Makefile.am | 9 +++++++++ 2 files changed, 12 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.3] Merge branch 'bug25936-031' into bug25936-032
by nickm＠torproject.org 03 May '18

03 May '18

commit 2edc9cd48457169409841c794832172bc959e63a Merge: 7c3f87eb4 598210509 Author: Taylor Yu <catalyst(a)torproject.org> Date: Thu Apr 26 15:58:39 2018 -0500 Merge branch 'bug25936-031' into bug25936-032 .travis.yml | 4 +++- Makefile.am | 9 +++++++++ 2 files changed, 12 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.2] Merge branch 'maint-0.3.2' into release-0.3.2
by nickm＠torproject.org 03 May '18

03 May '18

commit a1243864f263fdf9bc815ab31fa785f84d1b4b8d Merge: 4b14ff45f be5b4415c Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 3 13:38:54 2018 -0400 Merge branch 'maint-0.3.2' into release-0.3.2 .travis.yml | 4 +++- Makefile.am | 9 +++++++++ 2 files changed, 12 insertions(+), 1 deletion(-)

1 0