allow StrictEntryNode and StrictExitNode to be singular

svn:r2922

diff --git a/src/or/config.c b/src/or/config.c
index f34da4657e06371fbacf4335868018fa56988b1d..0c1f669b100de8675172745686e36a0dff56bac1 100644 (file)
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -58,6 +58,8 @@ static config_abbrev_t config_abbrevs[] = {
   PLURAL(HiddenServiceExcludeNode),
   PLURAL(RendNode),
   PLURAL(RendExcludeNode),
+  PLURAL(StrictEntryNode),
+  PLURAL(StrictExitNode),
   { "l", "Log", 1},
   { "BandwidthRateBytes", "BandwidthRate", 0},
   { "BandwidthBurstBytes", "BandwidthBurst", 0},

diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index e4fc159a9b8abceaacfe09590930c246e053af0c..07e85b11b3ea35d6529d7089187f86db6bfa482f 100644 (file)
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -308,7 +308,7 @@ void connection_ap_expire_beginning(void) {
   } /* end for */
 }
 
-/** Tell any AP streamss that are waiting for a new circuit that one is
+/** Tell any AP streams that are waiting for a new circuit that one is
  * available.
  */
 void connection_ap_attach_pending(void)

diff --git a/src/or/main.c b/src/or/main.c
index 9ad278a8effdf2a7faf571b1f188c51e9cf459e5..9b566822b3e2d5a8c593b193941c0568eb68489f 100644 (file)
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -1098,7 +1098,7 @@ static void do_list_fingerprint(void)
   char buf[FINGERPRINT_LEN+1];
   crypto_pk_env_t *k;
   const char *nickname = get_options()->Nickname;
-  if(!server_mode(get_options())) {
+  if (!server_mode(get_options())) {
     printf("Clients don't have long-term identity keys. Exiting.\n");
     return;
   }