[tor-commits] [tor/master] Don't send missing X-Desc-Gen-Reason on startup

[nickm at torproject.org]

commit 7f329206488cf844aee33fbd2e9724c72421b6af
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jul 11 10:36:55 2017 -0400

    Don't send missing X-Desc-Gen-Reason on startup
    
    Since we start with desc_clean_since = 0, we should have been
    starting with non-null desc_dirty_reason.
    
    Fixes bug 22884; bugfix on 0.2.3.4-alpha when X-Desc-Gen-Reason was
    added.
---
 changes/bug22885 | 5 +++++
 src/or/router.c  | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/changes/bug22885 b/changes/bug22885
new file mode 100644
index 000000000..d95e879eb
--- /dev/null
+++ 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
index 100c4cc94..1944420a0 100644
--- 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;