diff options
| author | Roger Dingledine <arma@torproject.org> | 2008-09-09 09:21:21 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2008-09-09 09:21:21 +0000 |
| commit | fa64d8041f88857de1e3b140c3df39022fba32ae (patch) | |
| tree | 48e599d78b295a81df1c815feeb6a18d52ef1385 /src | |
| parent | ef7af1d61e242913bcbeff1490d5300d1a9977c5 (diff) | |
| download | tor-fa64d8041f88857de1e3b140c3df39022fba32ae.tar.gz tor-fa64d8041f88857de1e3b140c3df39022fba32ae.zip | |
minor cleanups on karsten's patch
svn:r16810
Diffstat (limited to 'src')
| -rw-r--r-- | src/or/main.c | 2 | ||||
| -rw-r--r-- | src/or/rendservice.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/or/main.c b/src/or/main.c index 1df592d93d..a4bc71ef65 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1127,8 +1127,8 @@ run_scheduled_events(time_t now) /** 7. And upload service descriptors if necessary. */ if (has_completed_circuit && !we_are_hibernating()) { - rend_consider_descriptor_republication(); rend_consider_services_upload(now); + rend_consider_descriptor_republication(); } /** 8. and blow away any connections that need to die. have to do this now, diff --git a/src/or/rendservice.c b/src/or/rendservice.c index dcaa0343b0..0e715fe276 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -1420,7 +1420,7 @@ directory_post_to_hs_dir(rend_service_descriptor_t *renddesc, SMARTLIST_FOREACH(renddesc->successful_uploads, char *, c, tor_free(c);); smartlist_free(renddesc->successful_uploads); } - renddesc->all_uploads_performed = -1; + renddesc->all_uploads_performed = 1; } else { /* Remember which routers worked this time, so that we don't upload the * descriptor to them again. */ |