diff options
| author | Roger Dingledine <arma@torproject.org> | 2019-10-20 05:56:16 -0400 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2019-10-20 05:56:16 -0400 |
| commit | aab5d90858beb7eb9738c237dab5bcb7dd6ce91f (patch) | |
| tree | 441c8b938f847894865ea0960ab955190bd52783 /src | |
| parent | 37320bce064730b111018d255009390d887a8a17 (diff) | |
| parent | 8b4d7447ae2bc4929e41c0b916f4690ebbc7b9ec (diff) | |
| download | tor-aab5d90858beb7eb9738c237dab5bcb7dd6ce91f.tar.gz tor-aab5d90858beb7eb9738c237dab5bcb7dd6ce91f.zip | |
Merge branch 'maint-0.4.2'
Diffstat (limited to 'src')
| -rw-r--r-- | src/feature/hibernate/hibernate.c | 6 | ||||
| -rw-r--r-- | src/feature/rend/rendservice.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/feature/hibernate/hibernate.c b/src/feature/hibernate/hibernate.c index 674fe3c813..d3a1d23095 100644 --- a/src/feature/hibernate/hibernate.c +++ b/src/feature/hibernate/hibernate.c @@ -67,7 +67,7 @@ static hibernate_state_t hibernate_state = HIBERNATE_STATE_INITIAL; /** If are hibernating, when do we plan to wake up? Set to 0 if we * aren't hibernating. */ static time_t hibernate_end_time = 0; -/** If we are shutting down, when do we plan finally exit? Set to 0 if we +/** If we are shutting down, when do we plan to finally exit? Set to 0 if we * aren't shutting down. (This is obsolete; scheduled shutdowns are supposed * to happen from mainloop_schedule_shutdown() now.) */ static time_t shutdown_time = 0; @@ -562,7 +562,7 @@ time_to_record_bandwidth_usage(time_t now) /* Note every 600 sec */ #define NOTE_INTERVAL (600) /* Or every 20 megabytes */ -#define NOTE_BYTES 20*(1024*1024) +#define NOTE_BYTES (20*1024*1024) static uint64_t last_read_bytes_noted = 0; static uint64_t last_written_bytes_noted = 0; static time_t last_time_noted = 0; @@ -815,7 +815,7 @@ hibernate_soft_limit_reached(void) * We want to stop accepting connections when ALL of the following are true: * - We expect to use up the remaining bytes in under 3 hours * - We have used up 95% of our bytes. - * - We have less than 500MB of bytes left. + * - We have less than 500MBytes of bytes left. */ uint64_t soft_limit = (uint64_t) (acct_max * SOFT_LIM_PCT); if (acct_max > SOFT_LIM_BYTES && acct_max - SOFT_LIM_BYTES > soft_limit) { diff --git a/src/feature/rend/rendservice.c b/src/feature/rend/rendservice.c index 4d8a21e6a1..e0cf06b9df 100644 --- a/src/feature/rend/rendservice.c +++ b/src/feature/rend/rendservice.c @@ -3999,7 +3999,7 @@ remove_invalid_intro_points(rend_service_t *service, * accounted for when considiring uploading a descriptor. */ intro->circuit_established = 0; - /* Node is gone or we've reached our maximum circuit creationg retry + /* Node is gone or we've reached our maximum circuit creation retry * count, clean up everything, we'll find a new one. */ if (node == NULL || intro->circuit_retries >= MAX_INTRO_POINT_CIRCUIT_RETRIES) { |