From 2468a1bd2c3a989c4225897e58b5bf09ac08ba61 Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 5 Jun 2012 10:47:05 -0400
Subject: [PATCH] Revert "Disable (Cell,DirReq,Entry,ExitPort)Statistics on
bridges"
This reverts commit 981e896dd2eaf69798bb503c271306ee779dd6d2.
Apparently Karsten still needs DirReqStatistics for bridges; see
---
changes/bug5824 | 3 ---
src/or/config.c | 5 ++---
2 files changed, 2 insertions(+), 6 deletions(-)
delete mode 100644 changes/bug5824
diff --git a/changes/bug5824 b/changes/bug5824
deleted file mode 100644
index a75e8edfc0..0000000000
--- a/changes/bug5824
+++ /dev/null
@@ -1,3 +0,0 @@
- o Minor bugfixes:
- - Bridges now never collect statistics that were designed for
- relays. Fix for bug 5824; bugfix on 0.2.1.17-rc.
diff --git a/src/or/config.c b/src/or/config.c
index 03186bf010..090d96c155 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -1703,9 +1703,8 @@ options_act(const or_options_t *old_options)
time_t now = time(NULL);
int print_notice = 0;
- /* If we aren't acting as a server, or we are a bridge, we can't collect
- * stats anyway. */
- if (!public_server_mode(options)) {
+ /* If we aren't acting as a server, we can't collect stats anyway. */
+ if (!server_mode(options)) {
options->CellStatistics = 0;
options->DirReqStatistics = 0;
options->EntryStatistics = 0;
--
GitLab