summaryrefslogtreecommitdiff
path: root/src/or/router.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2009-08-12 22:02:07 -0400
committerNick Mathewson <nickm@torproject.org>2009-08-12 22:02:07 -0400
commite0dc2e907eb029bd4e3d7933ef72f3ff942a9b81 (patch)
tree872cf6e543fbc1b40ac7c4724daa4b189c3945d3 /src/or/router.c
parentafc9da72874b0e443843ef25090a97fab91530ec (diff)
parenta98643c1b5a39764204fcf6835a8b2bee670581d (diff)
downloadtor-e0dc2e907eb029bd4e3d7933ef72f3ff942a9b81.tar.gz
tor-e0dc2e907eb029bd4e3d7933ef72f3ff942a9b81.zip
Merge commit 'origin/maint-0.2.1'
Diffstat (limited to 'src/or/router.c')
-rw-r--r--src/or/router.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/router.c b/src/or/router.c
index 82db142057..d5a2576842 100644
--- a/src/or/router.c
+++ b/src/or/router.c
@@ -546,7 +546,7 @@ init_keys(void)
/* Must be called after keys are initialized. */
mydesc = router_get_my_descriptor();
if (authdir_mode(options)) {
- const char *m;
+ const char *m = NULL;
routerinfo_t *ri;
/* We need to add our own fingerprint so it gets recognized. */
if (dirserv_add_own_fingerprint(options->Nickname, get_identity_key())) {