sarah
/
tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'maint-0.2.2' into release-0.2.2

This commit is contained in:
Roger Dingledine 2011-03-04 00:43:20 -05:00
parent 17f873a20b 1d6af67ab8
commit b3820e0d03
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/tor.1.txt
View File

@ -34,7 +34,7 @@ OPTIONS
Display a short help message and exit.
**-f** __FILE__::
FILE contains further "option value" paris. (Default: @CONFDIR@/torrc)
FILE contains further "option value" pairs. (Default: @CONFDIR@/torrc)
**--hash-password**::
Generates a hashed password for control port access.

12
src/or/rephist.c
View File

@ -1602,18 +1602,24 @@ rep_hist_load_bwhist_state_section(bw_array_t *b,
b->cur_obs_time = start;
b->next_period = start + NUM_SECS_BW_SUM_INTERVAL;
SMARTLIST_FOREACH_BEGIN(s_values, const char *, cp) {
const char *maxstr = NULL;
v = tor_parse_uint64(cp, 10, 0, UINT64_MAX, &ok, NULL);
if (have_maxima) {
const char *maxstr = smartlist_get(s_maxima, cp_sl_idx);
maxstr = smartlist_get(s_maxima, cp_sl_idx);
mv = tor_parse_uint64(maxstr, 10, 0, UINT64_MAX, &ok_m, NULL);
mv *= NUM_SECS_ROLLING_MEASURE;
} else {
/* No maxima known; guess average rate to be conservative. */
mv = v / s_interval;
}
if (!ok || !ok_m) {
if (!ok) {
retval = -1;
log_notice(LD_HIST, "Could not parse '%s' into a number.'", cp);
log_notice(LD_HIST, "Could not parse value '%s' into a number.'",cp);
}
if (maxstr && !ok_m) {
retval = -1;
log_notice(LD_HIST, "Could not parse maximum '%s' into a number.'",
maxstr);
}
if (start < now) {