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

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

03 Aug '18

commit 4856a6e6c4b352f04b98f7f77c70a0c33dc8c29c Merge: fea35ddf0 42c6ebda1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Aug 3 07:33:45 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2 changes/bug20424_029_minimal | 4 ++++ configure.ac | 4 ++++ 2 files changed, 8 insertions(+)

1 0

[tor/release-0.3.3] When setting a nonstandard malloc, disable the system malloc.
by nickm＠torproject.org 03 Aug '18

03 Aug '18

commit 16bdbddc2cab90e360002b3440a4ed634e3c87f1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 11 09:36:24 2018 -0400 When setting a nonstandard malloc, disable the system malloc. Closes ticket 20424. --- changes/bug20424_029_minimal | 4 ++++ configure.ac | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/changes/bug20424_029_minimal b/changes/bug20424_029_minimal new file mode 100644 index 000000000..eb7886233 --- /dev/null +++ b/changes/bug20424_029_minimal @@ -0,0 +1,4 @@ + o Minor bugfixes (compilation): + - When compiling with --enable-openbsd-malloc or --enable-tcmalloc, tell + the compiler not to include the system malloc implementation. Fixes bug + 20424; bugfix on 0.2.0.20-rc. diff --git a/configure.ac b/configure.ac index 279660d9b..d70032992 100644 --- a/configure.ac +++ b/configure.ac @@ -1438,6 +1438,10 @@ fi if test "$using_custom_malloc" = "no"; then AC_CHECK_FUNCS(mallinfo) fi +if test "$using_custom_malloc" = "yes"; then + # Tell the C compiler not to use the system allocator functions. + TOR_CHECK_CFLAGS([-fno-builtin-malloc -fno-builtin-realloc -fno-builtin-calloc -fno-builtin-free]) +fi # By default, we're going to assume we don't have mlockall() # bionic and other platforms have various broken mlockall subsystems.

1 0

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

03 Aug '18

commit 920a7b37a5d05266c705a34965cbd0fb29e4da66 Merge: edfa74688 4856a6e6c Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Aug 3 07:33:45 2018 -0400 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug20424_029_minimal | 4 ++++ configure.ac | 4 ++++ 2 files changed, 8 insertions(+)

1 0

[tor/master] Merge branch 'maint-0.3.2' into maint-0.3.3
by nickm＠torproject.org 03 Aug '18

03 Aug '18

commit 2a6c1585b0f13e03eb7e8b8977d56a5cea8b4ce8 Merge: eb604f5fa 4856a6e6c Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Aug 3 07:33:45 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug20424_029_minimal | 4 ++++ configure.ac | 4 ++++ 2 files changed, 8 insertions(+)

1 0

[tor/release-0.3.2] When setting a nonstandard malloc, disable the system malloc.
by nickm＠torproject.org 03 Aug '18

03 Aug '18

commit 16bdbddc2cab90e360002b3440a4ed634e3c87f1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 11 09:36:24 2018 -0400 When setting a nonstandard malloc, disable the system malloc. Closes ticket 20424. --- changes/bug20424_029_minimal | 4 ++++ configure.ac | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/changes/bug20424_029_minimal b/changes/bug20424_029_minimal new file mode 100644 index 000000000..eb7886233 --- /dev/null +++ b/changes/bug20424_029_minimal @@ -0,0 +1,4 @@ + o Minor bugfixes (compilation): + - When compiling with --enable-openbsd-malloc or --enable-tcmalloc, tell + the compiler not to include the system malloc implementation. Fixes bug + 20424; bugfix on 0.2.0.20-rc. diff --git a/configure.ac b/configure.ac index 279660d9b..d70032992 100644 --- a/configure.ac +++ b/configure.ac @@ -1438,6 +1438,10 @@ fi if test "$using_custom_malloc" = "no"; then AC_CHECK_FUNCS(mallinfo) fi +if test "$using_custom_malloc" = "yes"; then + # Tell the C compiler not to use the system allocator functions. + TOR_CHECK_CFLAGS([-fno-builtin-malloc -fno-builtin-realloc -fno-builtin-calloc -fno-builtin-free]) +fi # By default, we're going to assume we don't have mlockall() # bionic and other platforms have various broken mlockall subsystems.

1 0

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

03 Aug '18

commit 42c6ebda1626371cc6b0fff0cc0710b841936bef Merge: 6443812e3 16bdbddc2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Aug 3 07:33:39 2018 -0400 Merge branch 'fix_nonstandard_malloc_029' into maint-0.2.9 changes/bug20424_029_minimal | 4 ++++ configure.ac | 4 ++++ 2 files changed, 8 insertions(+)

1 0

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

03 Aug '18

commit 2a6c1585b0f13e03eb7e8b8977d56a5cea8b4ce8 Merge: eb604f5fa 4856a6e6c Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Aug 3 07:33:45 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug20424_029_minimal | 4 ++++ configure.ac | 4 ++++ 2 files changed, 8 insertions(+)

1 0

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

03 Aug '18

commit 42c6ebda1626371cc6b0fff0cc0710b841936bef Merge: 6443812e3 16bdbddc2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Aug 3 07:33:39 2018 -0400 Merge branch 'fix_nonstandard_malloc_029' into maint-0.2.9 changes/bug20424_029_minimal | 4 ++++ configure.ac | 4 ++++ 2 files changed, 8 insertions(+)

1 0

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

03 Aug '18

commit 4856a6e6c4b352f04b98f7f77c70a0c33dc8c29c Merge: fea35ddf0 42c6ebda1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Aug 3 07:33:45 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2 changes/bug20424_029_minimal | 4 ++++ configure.ac | 4 ++++ 2 files changed, 8 insertions(+)

1 0

[tor/release-0.3.3] Merge branch 'fix_nonstandard_malloc_029' into maint-0.2.9
by nickm＠torproject.org 03 Aug '18

03 Aug '18

commit 42c6ebda1626371cc6b0fff0cc0710b841936bef Merge: 6443812e3 16bdbddc2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Aug 3 07:33:39 2018 -0400 Merge branch 'fix_nonstandard_malloc_029' into maint-0.2.9 changes/bug20424_029_minimal | 4 ++++ configure.ac | 4 ++++ 2 files changed, 8 insertions(+)

1 0