Commit ba9f796d authored by Anthony G. Basile's avatar Anthony G. Basile
Browse files

Alternative fix tor issue #4340

parent b30ea6af

build.sh

+1 −0
Original line number Diff line number Diff line
@@ -98,6 +98,7 @@ build_tor() 
	[ -f $TOR/src/or/tor ] && return 0

	tar zxvf $WORKING/../sources/$TOR.tar.gz

	cd $TOR

	for i in $WORKING/../configs/tor-*.patch; do patch -p 1 < $i ; done

	./configure --prefix= --enable-gcc-hardening --enable-linker-hardening

	make

	strip src/or/tor

configs/setup

+0 −1
Original line number Diff line number Diff line
@@ -254,7 +254,6 @@ importing() 
		if [ "x$DIRECTORY" = "xdirectory" ]

		then

			echo "DirPort 9030" >> /etc/tor/torrc

			echo "GeoIPFile /dev/null" >> /etc/tor/torrc

		fi



		echo

configs/tor-1000-disable-stats.patch

0 → 100644
+19 −0
Original line number Diff line number Diff line 
diff --git a/src/or/config.c b/src/or/config.c

--- a/src/or/config.c

+++ b/src/or/config.c

@@ -1425,6 +1425,7 @@ options_act(or_options_t *old_options)

         geoip_dirreq_stats_init(now);

         print_notice = 1;

       } else {

+        options->DirReqStatistics = 0;

         log_notice(LD_CONFIG, "Configured to measure directory request "

                               "statistics, but no GeoIP database found! "

                               "Please specify a GeoIP database using the "

@@ -1437,6 +1438,7 @@ options_act(or_options_t *old_options)

         geoip_entry_stats_init(now);

         print_notice = 1;

       } else {

+        options->EntryStatistics = 0;

         log_notice(LD_CONFIG, "Configured to measure entry node "

                               "statistics, but no GeoIP database found! "

                               "Please specify a GeoIP database using the "