Merge branch 'maint-0.3.3' into release-0.3.3

changes/bug25629

@@ -0,0 +1,3 @@
+  o Minor bugfixes (C correctness):
+    - Fix a very unlikely null pointer dereference.  Fixes bug 25629;
+      bugfix on 0.2.9.15.  Found by Coverity; this is CID 1430932.

src/or/nodelist.c

@@ -507,7 +507,9 @@ nodelist_add_microdesc(microdesc_t *md)
   if (rs == NULL)
     return NULL;
   node = node_get_mutable_by_id(rs->identity_digest);
-  if (node) {
+  if (node == NULL)
+    return NULL;
+
   node_remove_from_ed25519_map(node);
   if (node->md)
     node->md->held_by_nodes--;
@@ -521,8 +523,6 @@ nodelist_add_microdesc(microdesc_t *md)
     node_set_hsdir_index(node, ns);
   }
   node_add_to_ed25519_map(node);
-  }
-
   node_add_to_address_set(node);
 
   return node;