[tor-commits] [tor/master] Fix a typo in coverage builds.

2020-12-09 Thread nickm
commit ce1c3c689881f069b31a1345d0807a5c125ba615
Author: Nick Mathewson 
Date:   Wed Dec 9 13:31:34 2020 -0500

Fix a typo in coverage builds.

We should be using TOR_STATIC_LDFLAGS, not TOR_STATIC_LDFALGS.

Bug not in any released version of Tor.
---
 src/app/include.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/include.am b/src/app/include.am
index 8bb315fff1..2e2180deca 100644
--- a/src/app/include.am
+++ b/src/app/include.am
@@ -28,7 +28,7 @@ src_app_tor_cov_SOURCES = $(src_app_tor_SOURCES)
 src_app_tor_cov_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CPPFLAGS)
 src_app_tor_cov_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS)
 src_app_tor_cov_LDFLAGS = @TOR_LDFLAGS_zlib@ $(TOR_LDFLAGS_CRYPTLIB) \
-   @TOR_LDFLAGS_libevent@ @TOR_STATIC_LDFALGS@
+   @TOR_LDFLAGS_libevent@ @TOR_STATIC_LDFLAGS@
 src_app_tor_cov_LDADD = src/test/libtor-testing.a \
@TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ $(TOR_LIBS_CRYPTLIB) 
\
@TOR_LIB_WS32@ @TOR_LIB_IPHLPAPI@ @TOR_LIB_SHLWAPI@ @TOR_LIB_GDI@ \

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tor/master] Fix ControlSocketsGroupWritable typo

2020-12-08 Thread nickm
commit 0522f0e5077d3776a73caf45823c026de471e7b3
Author: Neel Chauhan 
Date:   Sat Nov 21 11:12:07 2020 -0800

Fix ControlSocketsGroupWritable typo
---
 src/app/config/config.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/config/config.c b/src/app/config/config.c
index df89b6ede9..0c3b6a61a3 100644
--- a/src/app/config/config.c
+++ b/src/app/config/config.c
@@ -3291,7 +3291,7 @@ options_validate_cb(const void *old_options_, void 
*options_, char **msg)
   }
 #else /* defined(HAVE_SYS_UN_H) */
   if (options->ControlSocketsGroupWritable && !options->ControlSocket) {
-*msg = tor_strdup("Setting ControlSocketGroupWritable without setting "
+*msg = tor_strdup("Setting ControlSocketsGroupWritable without setting "
   "a ControlSocket makes no sense.");
 return -1;
   }



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tor/master] Fix two typo bugs found by new state length test.

2019-05-15 Thread asn
commit 148c2d5bab051eb60e802fc6569c84a875c5f663
Author: Mike Perry 
Date:   Wed May 15 03:33:53 2019 +

Fix two typo bugs found by new state length test.
---
 src/core/or/circuitpadding.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/core/or/circuitpadding.c b/src/core/or/circuitpadding.c
index 7674f3510..3124e7403 100644
--- a/src/core/or/circuitpadding.c
+++ b/src/core/or/circuitpadding.c
@@ -253,7 +253,7 @@ circpad_histogram_bin_to_usec(const 
circpad_machine_runtime_t *mi,
 
   /* The infinity bin has an upper bound of infinity, so make sure we return
* that if they ask for it. */
-  if (bin > CIRCPAD_INFINITY_BIN(mi)) {
+  if (bin > CIRCPAD_INFINITY_BIN(state)) {
 return CIRCPAD_DELAY_INFINITE;
   }
 
@@ -936,7 +936,7 @@ circpad_machine_update_state_length_for_nonpadding(
 {
   const circpad_state_t *state = NULL;
 
-  if (mi->state_length != CIRCPAD_STATE_LENGTH_INFINITE)
+  if (mi->state_length == CIRCPAD_STATE_LENGTH_INFINITE)
 return;
 
   state = circpad_machine_current_state(mi);



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tor/master] Fix a typo

2019-01-11 Thread nickm
commit b69d28ae830ee0fea642395f0e7c2e89cc8a68d0
Author: rl1987 
Date:   Sat Jan 5 11:02:18 2019 +0200

Fix a typo
---
 src/test/test_hs_service.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/test_hs_service.c b/src/test/test_hs_service.c
index 3357ca2c5..ccb4d93fe 100644
--- a/src/test/test_hs_service.c
+++ b/src/test/test_hs_service.c
@@ -267,7 +267,7 @@ helper_clone_authorized_client(const 
hs_service_authorized_client_t *client)
 
 /* Helper: Return a newly allocated service object with the identity keypair
  * sets and the current descriptor. Then register it to the global map.
- * Caller should us hs_free_all() to free this service or remove it from the
+ * Caller should use hs_free_all() to free this service or remove it from the
  * global map before freeing. */
 static hs_service_t *
 helper_create_service(void)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tor/master] Fix a typo in an address_set.c comment.

2018-02-13 Thread nickm
commit 99fbbc6c478d346a469e61663a319c8cf03fec44
Author: Nick Mathewson 
Date:   Mon Feb 12 10:59:46 2018 -0500

Fix a typo in an address_set.c comment.
---
 src/common/address_set.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common/address_set.c b/src/common/address_set.c
index 6fa942b0d..4924cb65c 100644
--- a/src/common/address_set.c
+++ b/src/common/address_set.c
@@ -22,7 +22,7 @@
 /** How many 64-bit siphash values to extract per address */
 #define N_HASHES 2
 /** How many bloom-filter bits we set per address. This is twice the N_HASHES
- * value, since we split the siphash outcome two 32-bit values. */
+ * value, since we split the siphash output into two 32-bit values. */
 #define N_BITS_PER_ITEM (N_HASHES * 2)
 
 /*  This code is largely duplicated with digestset_t.  We should merge



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tor/master] Fix a typo in CodingStandards.md

2017-12-12 Thread nickm
commit 7b591996636052dc6d58ff8bd78b48fd3394115a
Author: teor 
Date:   Tue Dec 12 12:32:14 2017 +1100

Fix a typo in CodingStandards.md

Closes #24596.
---
 doc/HACKING/CodingStandards.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/HACKING/CodingStandards.md b/doc/HACKING/CodingStandards.md
index 4b1bf4718..79a6a9f0c 100644
--- a/doc/HACKING/CodingStandards.md
+++ b/doc/HACKING/CodingStandards.md
@@ -358,7 +358,7 @@ Don't call this `abc_free_()` function directly -- instead, 
wrap it in a
 macro called `abc_free()`, using the `FREE_AND_NULL` macro:
 
 void abc_free_(abc_t *obj);
-#define abc_free(obj) FREE_AND_NULL(abc_t, abc_free_, (abc))
+#define abc_free(obj) FREE_AND_NULL(abc_t, abc_free_, (obj))
 
 This macro will free the underlying `abc_t` object, and will also set
 the object pointer to NULL.



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tor/master] Fix a typo in the LearnCircuitBuildTimeout disabled log message

2016-09-13 Thread nickm
commit 4d9d2553baa6856b1d85ec26baa1ac3d2c24832a
Author: teor 
Date:   Mon Sep 5 15:12:48 2016 +1000

Fix a typo in the LearnCircuitBuildTimeout disabled log message
---
 src/or/config.c | 9 +++--
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/or/config.c b/src/or/config.c
index d56d9f6..36b2062 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -3468,15 +3468,12 @@ options_validate(or_options_t *old_options, 
or_options_t *options,
 int severity = LOG_NOTICE;
 /* Be a little quieter if we've deliberately disabled
  * LearnCircuitBuildTimeout. */
-if (options->OnionServiceSingleHopMode) {
+if (circuit_build_times_disabled()) {
   severity = LOG_INFO;
-#ifdef ENABLE_TOR2WEB_MODE
-} else if (options->Tor2webMode) {
-  severity = LOG_INFO;
-#endif
 }
 log_fn(severity, LD_CONFIG, "You disabled LearnCircuitBuildTimeout, but "
-   "didn't a CircuitBuildTimeout. I'll pick a plausible default.");
+   "didn't specify a CircuitBuildTimeout. I'll pick a plausible "
+   "default.");
   }
 
   if (options->PathBiasNoticeRate > 1.0) {



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tor/master] Fix a typo in a comment in rend_consider_services_intro_points

2016-09-13 Thread nickm
commit 3e4a401ead701750218146edde939ef74ce8a5d0
Author: teor 
Date:   Mon Sep 5 15:44:02 2016 +1000

Fix a typo in a comment in rend_consider_services_intro_points
---
 src/or/rendservice.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/or/rendservice.c b/src/or/rendservice.c
index 8b96f77..ed89268 100644
--- a/src/or/rendservice.c
+++ b/src/or/rendservice.c
@@ -3849,8 +3849,8 @@ rend_consider_services_intro_points(void)
  n_intro_points_to_open);
 break;
   }
-  /* Add the choosen node to the exclusion list in order to avoid to
-   * pick it again in the next iteration. */
+  /* Add the choosen node to the exclusion list in order to avoid picking
+   * it again in the next iteration. */
   smartlist_add(exclude_nodes, (void*)node);
   intro = tor_malloc_zero(sizeof(rend_intro_point_t));
   /* extend_info is for clients, so we want the multi-hop primary ORPort,



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tor/master] Fix a typo in the getting passphrase prompt for the ed25519 identity key

2016-06-29 Thread nickm
commit 54c3066c72aed043f65c6e02c3c92015f8e4b465
Author: Peter Palfrader 
Date:   Sat Jun 25 13:33:35 2016 +0200

Fix a typo in the getting passphrase prompt for the ed25519 identity key
---
 changes/bug19503| 3 +++
 src/or/routerkeys.c | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/changes/bug19503 b/changes/bug19503
new file mode 100644
index 000..30afded
--- /dev/null
+++ b/changes/bug19503
@@ -0,0 +1,3 @@
+  o Minor bugfixes (user interface):
+- Fix a typo in the getting passphrase prompt for the ed25519
+  identity key.
diff --git a/src/or/routerkeys.c b/src/or/routerkeys.c
index fba3491..12de8c5 100644
--- a/src/or/routerkeys.c
+++ b/src/or/routerkeys.c
@@ -115,7 +115,7 @@ read_encrypted_secret_key(ed25519_secret_key_t *out,
 
   while (1) {
 ssize_t pwlen =
-  do_getpass("Enter pasphrase for master key:", pwbuf, sizeof(pwbuf), 0,
+  do_getpass("Enter passphrase for master key:", pwbuf, sizeof(pwbuf), 0,
  get_options());
 if (pwlen < 0) {
   saved_errno = EINVAL;



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tor/master] Fix a typo in the comment for tor_addr_port_split

2016-01-07 Thread nickm
commit 1949908d134bb3764b0049be64f170f473f22fd8
Author: teor (Tim Wilson-Brown) 
Date:   Sun Dec 13 11:44:21 2015 +1100

Fix a typo in the comment for tor_addr_port_split
---
 src/common/address.c |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common/address.c b/src/common/address.c
index 69a8098..061bb7e 100644
--- a/src/common/address.c
+++ b/src/common/address.c
@@ -1784,7 +1784,7 @@ tor_addr_port_parse(int severity, const char *addrport,
 }
 
 /** Given an address of the form "host[:port]", try to divide it into its host
- * ane port portions, setting *address_out to a newly allocated string
+ * and port portions, setting *address_out to a newly allocated string
  * holding the address portion and *port_out to the port (or 0 if no
  * port is given).  Return 0 on success, -1 on failure. */
 int



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tor/master] Fix formatting typo in manpage.

2015-12-09 Thread nickm
commit 61d3364f269d22d7286850a93980ca74c9c21e27
Author: Andrew Kvalheim 
Date:   Tue Dec 8 18:23:43 2015 -0800

Fix formatting typo in manpage.
---
 doc/tor.1.txt |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 7f6d91d..56b709f 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -1801,7 +1801,7 @@ is non-zero):
 [[ServerDNSTestAddresses]] **ServerDNSTestAddresses** 
__address__,__address__,__...__::
 When we're detecting DNS hijacking, make sure that these __valid__ 
addresses
 aren't getting redirected. If they are, then our DNS is completely useless,
-and we'll reset our exit policy to "reject *:*". This option only affects
+and we'll reset our exit policy to "reject \*:*". This option only affects
 name lookups that your server does on behalf of clients. (Default:
 "www.google.com, www.mit.edu, www.yahoo.com, www.slashdot.org")
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tor/master] fix easy typo

2015-10-04 Thread arma
commit c9cb5516ab3380f266c7f5db68899cb4cff49202
Author: Roger Dingledine 
Date:   Sun Oct 4 12:28:25 2015 -0400

fix easy typo
---
 src/or/or.h |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/or/or.h b/src/or/or.h
index a80cd55..651d8be 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -4015,7 +4015,7 @@ typedef struct {
   char *ConsensusParams;
 
   /** Authority only: minimum number of measured bandwidths we must see
-   * before we only beliee measured bandwidths to assign flags. */
+   * before we only believe measured bandwidths to assign flags. */
   int MinMeasuredBWsForAuthToIgnoreAdvertised;
 
   /** The length of time that we think an initial consensus should be fresh.

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tor/master] Fix a typo in the ChangeLog, spotted by Yawning

2014-10-30 Thread nickm
commit b46259e368fcdb0b4c30aefc5fd14a6af1282131
Author: Nick Mathewson ni...@torproject.org
Date:   Thu Oct 30 09:52:36 2014 -0400

Fix a typo in the ChangeLog, spotted by Yawning
---
 ChangeLog |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index f7537f2..00a3e9c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,7 +3,7 @@ Changes in version 0.2.6.1-alpha - 2014-10-30
   includes numerous code cleanups and new tests, and fixes a large
   number of annoying bugs. Out-of-memory conditions are handled better
   than in 0.2.5, pluggable transports have improved proxy support, and
-  clients how use optimistic data for contacting hidden services. Also,
+  clients now use optimistic data for contacting hidden services. Also,
   we are now more robust to changes in what we consider a parseable
   directory object, so that tightening restrictions does not have a risk
   of introducing infinite download loops.

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tor/master] fix trivial typo

2014-02-10 Thread arma
commit dd3f2f63324f1c8eeaf6027f345ce8cee6438f1a
Author: Roger Dingledine a...@torproject.org
Date:   Mon Feb 10 16:05:35 2014 -0500

fix trivial typo
---
 src/or/directory.h |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/or/directory.h b/src/or/directory.h
index 0453160..3de6932 100644
--- a/src/or/directory.h
+++ b/src/or/directory.h
@@ -30,7 +30,7 @@ typedef enum {
   DIRIND_ONEHOP=0,
   /** Connect over a multi-hop anonymizing Tor circuit */
   DIRIND_ANONYMOUS=1,
-  /** Conncet to the DirPort directly */
+  /** Connect to the DirPort directly */
   DIRIND_DIRECT_CONN,
   /** Connect over a multi-hop anonymizing Tor circuit to our dirport */
   DIRIND_ANON_DIRPORT,

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tor/master] fix trivial typo

2013-04-12 Thread arma
commit 9a4e9b4a808fa93e419bb504624eb668080b4b4d
Author: Roger Dingledine a...@torproject.org
Date:   Fri Apr 12 04:27:10 2013 -0400

fix trivial typo
---
 src/or/dirserv.c |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/or/dirserv.c b/src/or/dirserv.c
index e837e4b..be6db64 100644
--- a/src/or/dirserv.c
+++ b/src/or/dirserv.c
@@ -1911,7 +1911,7 @@ router_counts_toward_thresholds(const node_t *node, 
time_t now,
  * the Weighted Fractional Uptime history, and use them to set thresholds for
  * the Stable, Fast, and Guard flags.  Update the fields stable_uptime,
  * stable_mtbf, enough_mtbf_info, guard_wfu, guard_tk, fast_bandwidth,
- * guard_bandwidh_including_exits, guard_bandwidth_excluding_exits,
+ * guard_bandwidth_including_exits, guard_bandwidth_excluding_exits,
  * total_bandwidth, and total_exit_bandwidth.
  *
  * Also, set the is_exit flag of each router appropriately. */

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tor/master] fix trivial typo

2012-10-13 Thread arma
commit 38b79473864fb662215761f650e8e03b7c518cd7
Author: Roger Dingledine a...@torproject.org
Date:   Sat Oct 13 18:34:24 2012 -0400

fix trivial typo
---
 src/or/command.c |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/or/command.c b/src/or/command.c
index 7ce134d..2ccd44e 100644
--- a/src/or/command.c
+++ b/src/or/command.c
@@ -160,7 +160,7 @@ command_process_cell(channel_t *chan, cell_t *cell)
 }
 
 /** Process an incoming var_cell from a channel; in the current protocol all
- * the var_cells are handshake-related and handles below the channel layer,
+ * the var_cells are handshake-related and handled below the channel layer,
  * so this just logs a warning and drops the cell.
  */
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tor/master] Fix comment typo

2012-09-25 Thread nickm
commit 38609f1354104f14bf7dde540b932450ab9a54cc
Author: Robert Ransom rransom.8...@gmail.com
Date:   Tue Sep 18 15:20:10 2012 -0400

Fix comment typo
---
 src/or/dirvote.c |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/or/dirvote.c b/src/or/dirvote.c
index b1b885c..21ad836 100644
--- a/src/or/dirvote.c
+++ b/src/or/dirvote.c
@@ -1893,7 +1893,7 @@ networkstatus_compute_consensus(smartlist_t *votes,
* listed that descriptor will have the same summary.  If not then
* something is fishy and we'll use the most common one (breaking
* ties in favor of lexicographically larger one (only because it
-   * lets me reuse more existing code.
+   * lets me reuse more existing code)).
*
* The other case that can happen is that no authority that voted
* for that descriptor has an exit policy summary.  That's



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tor/master] Fix comment typo in tor_memeq

2012-09-17 Thread nickm
commit 1e5cd1c7d6f45456c5e7c1b288e5e02e7c02b377
Author: Robert Ransom rransom.8...@gmail.com
Date:   Mon Sep 17 11:13:09 2012 -0400

Fix comment typo in tor_memeq
---
 src/common/di_ops.c |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/common/di_ops.c b/src/common/di_ops.c
index 7683c59..418d6e3 100644
--- a/src/common/di_ops.c
+++ b/src/common/di_ops.c
@@ -123,7 +123,7 @@ tor_memeq(const void *a, const void *b, size_t sz)
*
* If any_difference != 0:
*0  any_difference  256, so
-   *0  any_difference - 1  255
+   *0 = any_difference - 1  255
*(any_difference - 1)  8 == 0
*1  ((any_difference - 1)  8) == 0
*/

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tor/master] Fix a typo found by Mike.

2012-06-15 Thread nickm
commit eab75d2c36a4b6ee4bd634f7eff8fe6fa00b6c1c
Author: Nick Mathewson ni...@torproject.org
Date:   Fri Jun 15 16:12:04 2012 -0400

Fix a typo found by Mike.
---
 src/or/microdesc.c |6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/or/microdesc.c b/src/or/microdesc.c
index d5a27d5..42e8605 100644
--- a/src/or/microdesc.c
+++ b/src/or/microdesc.c
@@ -644,9 +644,9 @@ microdesc_list_missing_digest256(networkstatus_t *ns, 
microdesc_cache_t *cache,
 if (skip  digestmap_get(skip, rs-descriptor_digest))
   continue;
 if (tor_mem_is_zero(rs-descriptor_digest, DIGEST256_LEN)) {
-  log_info(LD_BUG, Found an entry in networktatus with no microdescriptor 

-   digest. (Router %s=%s at %s:%d.), rs-nickname,
-   hex_str(rs-identity_digest, DIGEST_LEN),
+  log_info(LD_BUG, Found an entry in networkstatus with no 
+   microdescriptor digest. (Router %s=%s at %s:%d.),
+   rs-nickname, hex_str(rs-identity_digest, DIGEST_LEN),
fmt_addr32(rs-addr), rs-or_port);
   continue;
 }



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tor/master] fix the typo on the typo fix

2012-06-15 Thread arma
commit c37b8023b70f7667db342ffd4c998df6b929f4e4
Author: Roger Dingledine a...@torproject.org
Date:   Fri Jun 15 20:34:16 2012 -0400

fix the typo on the typo fix
---
 src/or/connection.c |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/or/connection.c b/src/or/connection.c
index 2630020..e731a1c 100644
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@ -1052,7 +1052,7 @@ connection_listener_new(const struct sockaddr 
*listensockaddr,
* believe that matters, since you would need to open a ridiculous
* number of listeners while keeping the early ones open before you ever
* hit this.  An OR with a dozen ports open, for example, would have to
-   * close and re-open its listenerrs every second for 4 years nonstop.
+   * close and re-open its listeners every second for 4 years nonstop.
*/
   lis_conn-session_group = global_next_session_group--;
 }

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tor/master] Fix a typo in changes/bug5916

2012-05-30 Thread nickm
commit bf16e167f79afc5367422ee7e0c0b3587dc6c82d
Author: Nick Mathewson ni...@torproject.org
Date:   Wed May 30 11:18:49 2012 -0400

Fix a typo in changes/bug5916
---
 changes/bug5916 |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/changes/bug5916 b/changes/bug5916
index 0b2ea5d..b099c26 100644
--- a/changes/bug5916
+++ b/changes/bug5916
@@ -2,5 +2,5 @@
 - Fix a memory leak when trying to launch a DNS request when the
   network is disabled or the nameservers are unconfigurable.  Fix
   for bug 5916; bugfix on Tor 0.1.2.1-alpha (for the
-  unconfigurable namesrever case) and on 0.2.3.9-alpha (for the
+  unconfigurable nameserver case) and on 0.2.3.9-alpha (for the
   DisableNetwork case).

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tor/master] Fix minor typo in warning printout.

2012-05-30 Thread nickm
commit 2f0c0f92f84f1d29fda234db2bba41d20d5bf952
Author: Linus Nordberg li...@nordberg.se
Date:   Tue May 29 15:03:22 2012 +0200

Fix minor typo in warning printout.
---
 src/or/command.c |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/or/command.c b/src/or/command.c
index 7c4556e..9b14092 100644
--- a/src/or/command.c
+++ b/src/or/command.c
@@ -161,7 +161,7 @@ command_process_cell(cell_t *cell, or_connection_t *conn)
   cell-command != CELL_NETINFO) {
 log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL,
Received unexpected cell command %d in state %s; closing the 
-   connection,
+   connection.,
(int)cell-command,
conn_state_to_string(CONN_TYPE_OR,conn-_base.state));
 connection_mark_for_close(TO_CONN(conn));



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tor/master] fix quad typo in comments

2012-05-06 Thread arma
commit c648f9751f5639073ba70860dde6a8091bc6a6b8
Author: Roger Dingledine a...@torproject.org
Date:   Mon May 7 01:54:53 2012 -0400

fix quad typo in comments

i assume if nickm maintained libeven this would never have been
introduced. :)
---
 src/common/compat.c |8 
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/common/compat.c b/src/common/compat.c
index 1a03f5e..57fc021 100644
--- a/src/common/compat.c
+++ b/src/common/compat.c
@@ -129,7 +129,7 @@ tor_open_cloexec(const char *path, int flags, unsigned mode)
   if (fd = 0)
 return fd;
   /* If we got an error, see if it is EINVAL. EINVAL might indicate that,
-   * event though we were built on a system with O_CLOEXEC support, we
+   * even though we were built on a system with O_CLOEXEC support, we
* are running on one without. */
   if (errno != EINVAL)
 return -1;
@@ -980,7 +980,7 @@ tor_open_socket(int domain, int type, int protocol)
   if (SOCKET_OK(s))
 goto socket_ok;
   /* If we got an error, see if it is EINVAL. EINVAL might indicate that,
-   * event though we were built on a system with SOCK_CLOEXEC support, we
+   * even though we were built on a system with SOCK_CLOEXEC support, we
* are running on one without. */
   if (errno != EINVAL)
 return s;
@@ -1014,7 +1014,7 @@ tor_accept_socket(tor_socket_t sockfd, struct sockaddr 
*addr, socklen_t *len)
   if (SOCKET_OK(s))
 goto socket_ok;
   /* If we got an error, see if it is ENOSYS. ENOSYS indicates that,
-   * event though we were built on a system with accept4 support, we
+   * even though we were built on a system with accept4 support, we
* are running on one without. Also, check for EINVAL, which indicates that
* we are missing SOCK_CLOEXEC support. */
   if (errno != EINVAL  errno != ENOSYS)
@@ -1092,7 +1092,7 @@ tor_socketpair(int family, int type, int protocol, 
tor_socket_t fd[2])
   if (r == 0)
 goto sockets_ok;
   /* If we got an error, see if it is EINVAL. EINVAL might indicate that,
-   * event though we were built on a system with SOCK_CLOEXEC support, we
+   * even though we were built on a system with SOCK_CLOEXEC support, we
* are running on one without. */
   if (errno != EINVAL)
 return -errno;

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tor/master] fix trivial typo

2011-11-16 Thread arma
commit 3992c5487f23429c2782e7988aa0598407f6845a
Author: Roger Dingledine a...@torproject.org
Date:   Wed Nov 16 18:10:13 2011 -0500

fix trivial typo

somebody should s/authoritative directory server/directory authority/g
at some point
---
 src/or/router.c |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/or/router.c b/src/or/router.c
index c9f141b..b6b96a5 100644
--- a/src/or/router.c
+++ b/src/or/router.c
@@ -1024,7 +1024,7 @@ authdir_mode_any_nonhidserv(const or_options_t *options)
 }
 /** Return true iff we are an authoritative directory server that is
  * authoritative about receiving and serving descriptors of type
- * bpurpose/b its dirport.  Use -1 for any purpose. */
+ * bpurpose/b on its dirport.  Use -1 for any purpose. */
 int
 authdir_mode_handles_descs(const or_options_t *options, int purpose)
 {

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tor/master] Fix comment typo

2011-06-24 Thread nickm
commit 8a55da57ed17dfb9cefe3193cbda53a15547630e
Author: Robert Ransom rransom.8...@gmail.com
Date:   Sun Jun 19 01:25:51 2011 -0700

Fix comment typo
---
 src/test/tinytest_demo.c |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/test/tinytest_demo.c b/src/test/tinytest_demo.c
index bd33cc3..4d2f588 100644
--- a/src/test/tinytest_demo.c
+++ b/src/test/tinytest_demo.c
@@ -39,7 +39,7 @@
 /*  */
 
 /* First, let's see if strcmp is working.  (All your test cases should be
- * functions declared to take a single void * as) an argument. */
+ * functions declared to take a single void * as an argument.) */
 void
 test_strcmp(void *data)
 {



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tor/master] Fix comment typo

2011-06-17 Thread nickm
commit 70785f87bb47e481053719f2a514bf0598c62b2d
Author: Robert Ransom rransom.8...@gmail.com
Date:   Thu Jun 16 02:57:58 2011 -0700

Fix comment typo
---
 src/or/control.c |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/or/control.c b/src/or/control.c
index 2308cd6..2170a9b 100644
--- a/src/or/control.c
+++ b/src/or/control.c
@@ -98,7 +98,7 @@ static int disable_log_messages = 0;
 static int authentication_cookie_is_set = 0;
 /** If authentication_cookie_is_set, a secret cookie that we've stored to disk
  * and which we're using to authenticate controllers.  (If the controller can
- * read it off disk, it has permission to connect. */
+ * read it off disk, it has permission to connect.) */
 static char authentication_cookie[AUTHENTICATION_COOKIE_LEN];
 
 /** A sufficiently large size to record the last bootstrap phase string. */



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tor/master] Fix comment typo

2011-05-22 Thread nickm
commit cb9df5e53c169efc0ec1ccbfeea4c8d2878b1a39
Author: Robert Ransom rransom.8...@gmail.com
Date:   Thu May 12 00:27:19 2011 -0700

Fix comment typo
---
 src/common/compat_libevent.c |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/common/compat_libevent.c b/src/common/compat_libevent.c
index 3ad9be1..6d89be8 100644
--- a/src/common/compat_libevent.c
+++ b/src/common/compat_libevent.c
@@ -48,7 +48,7 @@ typedef uint32_t le_version_t;
  * it is. */
 #define LE_OLD V(0,0,0)
 /** Represents a version of libevent so weird we can't figure out what version
- * it it. */
+ * it is. */
 #define LE_OTHER V(0,0,99)
 
 static le_version_t tor_get_libevent_version(const char **v_out);



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tor/master] Fix comment typo

2011-05-22 Thread nickm
commit b7452dcbcb2f086e3fd7daf0c31b95d9e777190a
Author: Robert Ransom rransom.8...@gmail.com
Date:   Tue May 10 05:15:02 2011 -0700

Fix comment typo
---
 src/common/compat.h |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/common/compat.h b/src/common/compat.h
index af795ff..8144026 100644
--- a/src/common/compat.h
+++ b/src/common/compat.h
@@ -398,7 +398,7 @@ int get_n_open_sockets(void);
 #define tor_socket_send(s, buf, len, flags) send(s, buf, len, flags)
 #define tor_socket_recv(s, buf, len, flags) recv(s, buf, len, flags)
 
-/** Implementatino of struct in6_addr for platforms that do not have it.
+/** Implementation of struct in6_addr for platforms that do not have it.
  * Generally, these platforms are ones without IPv6 support, but we want to
  * have a working in6_addr there anyway, so we can use it to parse IPv6
  * addresses. */



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tor/master] Fix comment typo

2011-05-22 Thread nickm
commit 86aeb152cab3d0c9d5d8b301e5eb5e3afe497ea9
Author: Robert Ransom rransom.8...@gmail.com
Date:   Wed May 18 04:35:20 2011 -0700

Fix comment typo
---
 src/or/or.h |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/or/or.h b/src/or/or.h
index 546c38a..52da63a 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -1009,7 +1009,7 @@ typedef struct connection_t {
   /* 023 move this field, and all the listener-only fields (just
  socket_family, I think), into a new listener_connection_t subtype. */
   /** If the connection is a CONN_TYPE_AP_DNS_LISTENER, this field points
-   * to the evdns_server_port is uses to listen to and answer connections. */
+   * to the evdns_server_port it uses to listen to and answer connections. */
   struct evdns_server_port *dns_server_port;
 
   /** Unique ID for measuring tunneled network status requests. */



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits