aboutsummaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2014-04-25 22:01:48 -0400
committerNick Mathewson <nickm@torproject.org>2014-04-25 22:01:48 -0400
commitd2147cc7ba5c5d5114bae61000cbf757353c3ed6 (patch)
tree232acb825819feaaf86ac3640c4ff070655ef98c /ChangeLog
parent03ce73327ce07499df563919764ea020f880da6b (diff)
downloadtor-d2147cc7ba5c5d5114bae61000cbf757353c3ed6.tar
tor-d2147cc7ba5c5d5114bae61000cbf757353c3ed6.tar.gz
Fix hyphen handling in format_changelog
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog12
1 files changed, 6 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index e4387e14a..8559b7149 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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