diff options
author | Nick Mathewson <nickm@torproject.org> | 2008-05-29 00:54:28 +0000 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2008-05-29 00:54:28 +0000 |
commit | d12b9965f9856b32a58791948653ac14eb0c7ba9 (patch) | |
tree | a717f2064a5cb443aa52fc18af1532ec5c1db338 | |
parent | 3c504e3fbf06e042e9799f0947109e6f45db6cdb (diff) | |
download | tor-d12b9965f9856b32a58791948653ac14eb0c7ba9.tar.gz tor-d12b9965f9856b32a58791948653ac14eb0c7ba9.zip |
Backport: Do not ship a fallback-consensus until the related bugs are fixed.
svn:r14795
-rw-r--r-- | src/config/Makefile.am | 4 | ||||
-rw-r--r-- | tor.spec.in | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/config/Makefile.am b/src/config/Makefile.am index 5345b9f1ea..f6cabaaa3c 100644 --- a/src/config/Makefile.am +++ b/src/config/Makefile.am @@ -1,11 +1,11 @@ confdir = $(sysconfdir)/tor tordatadir = $(datadir)/tor -EXTRA_DIST = fallback-consensus geoip +EXTRA_DIST = geoip conf_DATA = torrc.sample -tordata_DATA = fallback-consensus geoip +tordata_DATA = geoip # If we don't have it, fake it. fallback-consensus: diff --git a/tor.spec.in b/tor.spec.in index 6c72ecc98e..cbf911243f 100644 --- a/tor.spec.in +++ b/tor.spec.in @@ -289,7 +289,6 @@ exit 0 %{_bindir}/torify %{_bindir}/tor-resolve %{_bindir}/tor-gencert -%{_datadir}/tor/fallback-consensus %{_datadir}/tor/geoip %config %{_initrddir}/%{name} %config(noreplace) %attr(0644,root,root) %{_sysconfdir}/logrotate.d/%{name} |