summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2007-11-11 01:27:02 +0000
committerRoger Dingledine <arma@torproject.org>2007-11-11 01:27:02 +0000
commit8a1b394695f7157250b659c36a2d98f073fed51e (patch)
tree0c8fb29741287193b646ba3f90ce94cab1b6d9bc
parent8ca51869fdcd653406dd908d1661a25315393bf9 (diff)
downloadtor-8a1b394695f7157250b659c36a2d98f073fed51e.tar.gz
tor-8a1b394695f7157250b659c36a2d98f073fed51e.zip
We were including instructions about what to do with the
src/config/fallback-consensus file, but we weren't actually including it in the tarball. Disable all of that for now. svn:r12467
-rw-r--r--ChangeLog9
-rw-r--r--src/config/Makefile.am4
2 files changed, 7 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 509a968235..0c03a54a30 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-Changes in version 0.2.0.11-alpha - 2007-11-??
+Changes in version 0.2.0.11-alpha - 2007-11-10
o Security fixes:
- Exit policies now reject connections that are addressed to a
relay's public (external) IP address too, unless
@@ -10,9 +10,10 @@ Changes in version 0.2.0.11-alpha - 2007-11-??
- Allow people to say PreferTunnelledDirConns rather than
PreferTunneledDirConns, for those alternate-spellers out there.
- o Minor bugfixes:
- - We weren't actually including the src/config/fallback-consensus
- file in the tarball. Reported by phobos.
+ o Packaging fixes on 0.2.0.10-alpha:
+ - We were including instructions about what to do with the
+ src/config/fallback-consensus file, but we weren't actually
+ including it in the tarball. Disable all of that for now.
Changes in version 0.2.0.10-alpha - 2007-11-10
diff --git a/src/config/Makefile.am b/src/config/Makefile.am
index 2af3b6020b..07e7cf26a9 100644
--- a/src/config/Makefile.am
+++ b/src/config/Makefile.am
@@ -1,10 +1,10 @@
confdir = $(sysconfdir)/tor
-EXTRA_DIST = fallback-consensus
+#EXTRA_DIST = fallback-consensus
conf_DATA = torrc.sample
-data_DATA = fallback-consensus
+#data_DATA = fallback-consensus
# If we don't have it, fake it.
fallback-consensus: