Merge "Fix <wctype.h>."
diff --git a/libc/include/pthread.h b/libc/include/pthread.h
index b409ff2..a0fcc88 100644
--- a/libc/include/pthread.h
+++ b/libc/include/pthread.h
@@ -286,7 +286,6 @@
// Bionic additions that are deprecated even in the 32-bit ABI.
int pthread_cond_timedwait_relative_np(pthread_cond_t*, pthread_mutex_t*, const struct timespec*) __attribute__((deprecated("use pthread_cond_timedwait instead")));
-int pthread_cond_timeout_np(pthread_cond_t*, pthread_mutex_t*, unsigned) __attribute__((deprecated("use pthread_cond_timedwait instead")));
int pthread_mutex_lock_timeout_np(pthread_mutex_t*, unsigned) __attribute__((deprecated("use pthread_mutex_timedlock instead")));
diff --git a/libc/zoneinfo/tzdata b/libc/zoneinfo/tzdata
index d2cc535..5229797 100644
--- a/libc/zoneinfo/tzdata
+++ b/libc/zoneinfo/tzdata
Binary files differ