nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 21:23:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bug22885_squashed'

Browse Source
This commit is contained in:
Nick Mathewson 2017-08-03 09:33:40 -04:00
commit 96cf608b2e
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changes/bug22885 Normal file
View File

@ -0,0 +1,5 @@
o Minor bugfixes (relay):
- When uploading our descriptor for the first time after startup,
report the reason for uploading as "Tor just started" rather than
leaving it blank. Fixes bug 22885; bugfix on 0.2.3.4-alpha.

2
src/or/router.c
View File

@ -1856,7 +1856,7 @@ static const char *desc_gen_reason = NULL;
* now. */ * now. */
static time_t desc_clean_since = 0; static time_t desc_clean_since = 0;
/** Why did we mark the descriptor dirty? */ /** Why did we mark the descriptor dirty? */
static const char *desc_dirty_reason = NULL; static const char *desc_dirty_reason = "Tor just started";
/** Boolean: do we need to regenerate the above? */ /** Boolean: do we need to regenerate the above? */
static int desc_needs_upload = 0; static int desc_needs_upload = 0;