Merge branch 'master' into dj/malloc-tcache

diff --cc elf/dl-tunables.list
index 3e498759cbedb50898a953c59b310185371a72dc,cb9e8f173b9074fd16ae9296cce85af668b5a7ce..37620c82e9717185bb859a2105c5d0d2901f056b
--- 1/elf/dl-tunables.list
--- 2/elf/dl-tunables.list
+++ b/elf/dl-tunables.list
@@@ -63,18 -74,7 +74,19 @@@ glibc 
        type: SIZE_T
        env_alias: MALLOC_ARENA_TEST
        minval: 1
+       security_level: SXID_IGNORE
      }
 +    tcache_max {
 +      type: SIZE_T
 +      env_alias: MALLOC_TCACHE_MAX
 +    }
 +    tcache_count {
 +      type: SIZE_T
 +      env_alias: MALLOC_TCACHE_COUNT
 +    }
 +    tcache_unsorted_limit {
 +      type: SIZE_T
 +      env_alias: MALLOC_TCACHE_UNSORTED_LIMIT
 +    }
    }
  }

diff --cc malloc/arena.c
Simple merge

diff --cc malloc/malloc.c
Simple merge