diff --git a/ChangeLog b/ChangeLog
index f4ff34fb40..f68ece2130 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,11 @@ Changes in version 0.2.0.4-alpha - 2007-??-??
     - Be even more aggressive about releasing RAM from small
       empty buffers. Thanks to our free-list code, this shouldn't be too
       performance-intensive.
+    - Disable sentiel-based debugging for buffer code: we squashed all
+      the bugs that this was supposed to detect a long time ago, and
+      now its only effect is to change our buffer sizes from nice
+      powers of two (which platform mallocs tend to like) to values
+      siightly over powers of two (which make some platform mallocs sad).
 
 
 Changes in version 0.2.0.3-alpha - 2007-07-29
diff --git a/src/or/buffers.c b/src/or/buffers.c
index 30f98bd580..3904b091ef 100644
--- a/src/or/buffers.c
+++ b/src/or/buffers.c
@@ -15,7 +15,7 @@ const char buffers_c_id[] =
 
 #include "or.h"
 
-#define SENTINELS
+#undef SENTINELS
 #undef CHECK_AFTER_RESIZE
 #undef PARANOIA
 #undef NOINLINE