commit 96cf608b2eeb4643290917b093ae9bd1c1364700 parent 40c7871f46bbfe03480eb159e5365f49e6df24f5 Author: Nick Mathewson <nickm@torproject.org> Date: Thu, 3 Aug 2017 09:33:40 -0400 Merge branch 'bug22885_squashed' Diffstat:
| A | changes/bug22885 | | | 5 | +++++ |
| M | src/or/router.c | | | 2 | +- |
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/changes/bug22885 b/changes/bug22885 @@ -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. + diff --git a/src/or/router.c b/src/or/router.c @@ -1856,7 +1856,7 @@ static const char *desc_gen_reason = NULL; * now. */ static time_t desc_clean_since = 0; /** 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? */ static int desc_needs_upload = 0;