Bring remaining 0.2.5.5-alpha entries into changelog

2 files changed, 23 insertions, 4 deletions

diff --git a/scripts/maint/format_changelog.py b/scripts/maint/format_changelog.py
index 86f5c5039..f67e89b60 100755
--- a/scripts/maint/format_changelog.py
+++ b/scripts/maint/format_changelog.py
@@ -270,7 +270,16 @@ class ChangeLog(object):
 CL = ChangeLog()
 parser = head_parser
 
-sys.stdin = open('ChangeLog', 'r')
+if len(sys.argv) == 1:
+    fname = 'ChangeLog'
+else:
+    fname = sys.argv[1]
+
+fname_new = fname+".new"
+
+sys.stdin = open(fname, 'r')
+
+nextline = None
 
 for line in sys.stdin:
     line = line.rstrip()
@@ -286,13 +295,14 @@ for line in sys.stdin:
 
 CL.lint()
 
-sys.stdout = open('ChangeLog.new', 'w')
+sys.stdout = open(fname_new, 'w')
 
 CL.dump()
 
-print nextline
+if nextline is not None:
+    print nextline
 
 for line in sys.stdin:
     sys.stdout.write(line)
 
-os.rename('ChangeLog.new', 'ChangeLog')
+os.rename(fname_new, fname)
diff --git a/scripts/maint/sortChanges.py b/scripts/maint/sortChanges.py
index f70490bad..726a723f9 100755
--- a/scripts/maint/sortChanges.py
+++ b/scripts/maint/sortChanges.py
@@ -1,4 +1,13 @@
 #!/usr/bin/python
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information
+
+"""This script sorts a bunch of changes files listed on its command
+   line into roughly the order in which they should appear in the
+   changelog.
+
+   TODO: collation support.
+"""
 
 import re
 import sys