sarah
/
tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix hyphen handling in format_changelog

This commit is contained in:
Nick Mathewson 2014-04-25 22:01:48 -04:00
parent 03ce73327c
commit d2147cc7ba
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@ -77,9 +77,9 @@ Changes in version 0.2.5.4-alpha - 2014-04-25
FreeBSD. To enable it, set "TransProxyType ipfw". Resolves ticket
10267; patch from "yurivict".
- Support OpenBSD's divert-to rules with the pf firewall for
transparent proxy ports. To enable it, set "TransProxyType pf-
divert". This allows Tor to run a TransPort transparent proxy port
on OpenBSD 4.4 or later without root privileges. See the
transparent proxy ports. To enable it, set "TransProxyType
pf-divert". This allows Tor to run a TransPort transparent proxy
port on OpenBSD 4.4 or later without root privileges. See the
pf.conf(5) manual page for information on configuring pf to use
divert-to rules. Closes ticket 10896; patch from Dana Koch.
@ -187,9 +187,9 @@ Changes in version 0.2.5.4-alpha - 2014-04-25
CPPFLAGS. Fixes bug 11296; bugfix on 0.2.5.3-alpha.
o Minor bugfixes (bridges):
- Avoid potential crashes or bad behavior when launching a server-
side managed proxy with ORPort or ExtORPort temporarily disabled.
Fixes bug 9650; bugfix on 0.2.3.16-alpha.
- Avoid potential crashes or bad behavior when launching a
server-side managed proxy with ORPort or ExtORPort temporarily
disabled. Fixes bug 9650; bugfix on 0.2.3.16-alpha.
o Minor bugfixes (platform-specific):
- Fix compilation on Solaris, which does not have <endian.h>. Fixes

3
contrib/format_changelog.py
View File

@ -110,7 +110,8 @@ class ChangeLog(object):
text = " ".join(re.sub(r'\s+', ' ', line.strip()) for line in par)
print textwrap.fill(text, width=72,
initial_indent=" "*indent1,
subsequent_indent=" "*indent2)
subsequent_indent=" "*indent2,
break_on_hyphens=False)
def dump(self):
print self.mainhead