Merge github.com:grpc/grpc into one-read

Conflicts:
	src/core/iomgr/tcp_posix.c
	src/core/profiling/basic_timers.c

1 files changed, 2 insertions, 2 deletions

diff --git a/src/core/surface/init.c b/src/core/surface/init.c
index a5d86d0071..d6eb9b2c24 100644
--- a/src/core/surface/init.c
+++ b/src/core/surface/init.c
@@ -65,7 +65,7 @@ void grpc_init(void) {
     grpc_iomgr_init();
     grpc_tracer_init("GRPC_TRACE");
     census_init();
-    grpc_timers_log_global_init();
+    grpc_timers_global_init();
   }
   gpr_mu_unlock(&g_init_mu);
 }
@@ -75,7 +75,7 @@ void grpc_shutdown(void) {
   if (--g_initializations == 0) {
     grpc_iomgr_shutdown();
     census_shutdown();
-    grpc_timers_log_global_destroy();
+    grpc_timers_global_destroy();
   }
   gpr_mu_unlock(&g_init_mu);
 }