diff options
author | Nick Mathewson <nickm@torproject.org> | 2017-11-17 09:23:07 -0500 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2017-11-17 09:23:07 -0500 |
commit | b2e1910017ca19783871877456205aa4a0bee4a6 (patch) | |
tree | 40945d0c4797679fe403495daf61341cf95dce27 | |
parent | 00aeecb397a65b3687a01fbe7b33773ccbbac158 (diff) | |
parent | 85778dc92d652e4781812659590099ae9232e175 (diff) | |
download | tor-b2e1910017ca19783871877456205aa4a0bee4a6.tar.gz tor-b2e1910017ca19783871877456205aa4a0bee4a6.zip |
Merge branch 'maint-0.3.2' into release-0.3.2
-rw-r--r-- | changes/bug23861 | 5 | ||||
-rw-r--r-- | src/or/directory.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/changes/bug23861 b/changes/bug23861 new file mode 100644 index 0000000000..c6f017640d --- /dev/null +++ b/changes/bug23861 @@ -0,0 +1,5 @@ + o Minor bugfixes (logging, relay): + - Suppress a log notice when relay descriptors arrive. We already have a + bootstrap progress for this so no need to log notice everytime tor + receives relay descriptors. Microdescriptors behave the same. Fixes bug + 23861; bugfix on 0.2.8.2-alpha. diff --git a/src/or/directory.c b/src/or/directory.c index 836f862988..b3dbb0d1e0 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -2889,7 +2889,7 @@ handle_response_fetch_desc(dir_connection_t *conn, conn->router_purpose, conn->base_.address)) { time_t now = approx_time(); - directory_info_has_arrived(now, 0, 0); + directory_info_has_arrived(now, 0, 1); } } } |