Revert "Disable (Cell,DirReq,Entry,ExitPort)Statistics on bridges"

This reverts commit 981e896dd2.

Apparently Karsten still needs DirReqStatistics for bridges; see
This commit is contained in:
Nick Mathewson 2012-06-05 10:47:05 -04:00
parent 38642a9369
commit 2468a1bd2c
2 changed files with 2 additions and 6 deletions

View File

@ -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.

View File

@ -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;