Write fingerprint to file and log without spaces

Now it will look like the fingerprints in our bridges documentation,
and confuse fewer users.

diff --git a/ChangeLog b/ChangeLog
index fed57aaf4f6f428b335827ae2dc2a4aad39bec66..2747420dd6d213975160713df9b4edab760a6bc2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,12 @@ Changes in version 0.2.1.19 - 2009-07-??
     - Make accessing hidden services on 0.2.1.x work right
       again. Bugfix on 0.2.1.3-alpha; workaround for bug 1038.
 
+  o Minor features:
+    - When a relay/bridge is writing out its identity key fingerprint to
+      the "fingerprint" file and to its logs, write it without spaces. Now
+      it will look like the fingerprints in our bridges documentation,
+      and confuse fewer users.
+
   o Minor bugfixes:
     - Avoid leaking memory every time we get a create cell but we have
       so many already queued that we refuse it. Bugfix on 0.2.0.19-alpha;

diff --git a/src/or/router.c b/src/or/router.c
index 93afe4fad51960505de8ddd61d8ff84089e8abf1..6f899854e322e31380264de5f4a20b1ef1691333 100644 (file)
--- a/src/or/router.c
+++ b/src/or/router.c
@@ -568,7 +568,7 @@ init_keys(void)
   /* 5. Dump fingerprint to 'fingerprint' */
   keydir = get_datadir_fname("fingerprint");
   log_info(LD_GENERAL,"Dumping fingerprint to \"%s\"...",keydir);
-  if (crypto_pk_get_fingerprint(get_identity_key(), fingerprint, 1)<0) {
+  if (crypto_pk_get_fingerprint(get_identity_key(), fingerprint, 0)<0) {
     log_err(LD_GENERAL,"Error computing fingerprint");
     tor_free(keydir);
     return -1;