diff --git a/changes/bug1031 b/changes/bug1031
new file mode 100644
index 0000000000..e3ab49b2bd
--- /dev/null
+++ b/changes/bug1031
@@ -0,0 +1,5 @@
+  o Code cleanup:
+    - Avoid use of reserved identifiers in our C code. The C standard
+      doesn't like us declaring anything that starts with an
+      underscore, so let's knock it off before we get in trouble. Fix
+      for bug 1031; bugfix on the first Tor commit.