[tor-commits] [tor/master] fix typos and trivial syntax problems
arma at torproject.org
arma at torproject.org
Sun Dec 18 09:06:26 UTC 2016
commit 51ee549a90e3e1b6c87f4ac588ac9fed51f0cc27
Author: Roger Dingledine <arma at torproject.org>
Date: Sun Dec 18 04:06:02 2016 -0500
fix typos and trivial syntax problems
---
ChangeLog | 2 +-
src/common/sandbox.c | 2 +-
src/or/circuituse.c | 2 +-
src/or/config.c | 12 ++++++------
src/or/connection_edge.c | 2 +-
src/or/dirserv.c | 2 +-
src/or/or.h | 2 +-
src/or/routerlist.c | 2 +-
8 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index b55433e..e080d99 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -454,7 +454,7 @@ Changes in version 0.2.9.3-alpha - 2016-09-23
o Major bugfixes (circuit building):
- Hidden service client-to-intro-point and service-to-rendezvous-
- point cicruits use the TAP key supplied by the protocol, to avoid
+ point circuits use the TAP key supplied by the protocol, to avoid
epistemic attacks. Fixes bug 19163; bugfix on 0.2.4.18-rc.
o Major bugfixes (compilation, OpenBSD):
diff --git a/src/common/sandbox.c b/src/common/sandbox.c
index ebc843e..8e72ebf 100644
--- a/src/common/sandbox.c
+++ b/src/common/sandbox.c
@@ -1542,7 +1542,7 @@ sandbox_getaddrinfo(const char *name, const char *servname,
return err;
}
- /* Otherwise, the sanbox is on. If we have an item, yield its cached
+ /* Otherwise, the sandbox is on. If we have an item, yield its cached
result. */
if (item) {
*res = item->res;
diff --git a/src/or/circuituse.c b/src/or/circuituse.c
index 456a9c6..ecd35af 100644
--- a/src/or/circuituse.c
+++ b/src/or/circuituse.c
@@ -2127,7 +2127,7 @@ circuit_get_open_circ_or_launch(entry_connection_t *conn,
* will have to launch one!
*/
- /* THe chosen exit node, if there is one. */
+ /* The chosen exit node, if there is one. */
extend_info_t *extend_info=NULL;
const int n_pending = count_pending_general_client_circuits();
diff --git a/src/or/config.c b/src/or/config.c
index 6c8976d..60c00d4 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -2430,8 +2430,8 @@ using_default_dir_authorities(const or_options_t *options)
* Fail if one or more of the following is true:
* - DNS name in <b>options-\>Address</b> cannot be resolved.
* - <b>options-\>Address</b> is a local host address.
- * - Attempt to getting local hostname fails.
- * - Attempt to getting network interface address fails.
+ * - Attempt at getting local hostname fails.
+ * - Attempt at getting network interface address fails.
*
* Return 0 if all is well, or -1 if we can't find a suitable
* public IP address.
@@ -2811,7 +2811,7 @@ compute_publishserverdescriptor(or_options_t *options)
#define MIN_REND_POST_PERIOD (10*60)
#define MIN_REND_POST_PERIOD_TESTING (5)
-/** Higest allowable value for PredictedPortsRelevanceTime; if this is
+/** Highest allowable value for PredictedPortsRelevanceTime; if this is
* too high, our selection of exits will decrease for an extended
* period of time to an uncomfortable level .*/
#define MAX_PREDICTED_CIRCS_RELEVANCE (60*60)
@@ -2954,12 +2954,12 @@ options_validate_single_onion(or_options_t *options, char **msg)
REJECT("Non-anonymous (Tor2web) mode is incompatible with using Tor as a "
"hidden service. Please remove all HiddenServiceDir lines, or use "
"a version of tor compiled without --enable-tor2web-mode, or use "
- " HiddenServiceNonAnonymousMode.");
+ "HiddenServiceNonAnonymousMode.");
}
if (rend_service_allow_non_anonymous_connection(options)
&& options->UseEntryGuards) {
- /* Single Onion services only use entry guards when uploading descriptors,
+ /* Single Onion services only use entry guards when uploading descriptors;
* all other connections are one-hop. Further, Single Onions causes the
* hidden service code to do things which break the path bias
* detector, and it's far easier to turn off entry guards (and
@@ -3002,7 +3002,7 @@ options_validate(or_options_t *old_options, or_options_t *options,
*msg = NULL;
/* Set UseEntryGuards from the configured value, before we check it below.
- * We change UseEntryGuards whenn it's incompatible with other options,
+ * We change UseEntryGuards when it's incompatible with other options,
* but leave UseEntryGuards_option with the original value.
* Always use the value of UseEntryGuards, not UseEntryGuards_option. */
options->UseEntryGuards = options->UseEntryGuards_option;
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index fb077bb..415f9e4 100644
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -1638,7 +1638,7 @@ connection_ap_handshake_rewrite_and_attach(entry_connection_t *conn,
return -1;
}
/* You can't make connections to internal addresses, by default.
- * Exceptions are begindir requests (where the address is meaningless,
+ * Exceptions are begindir requests (where the address is meaningless),
* or cases where you've hand-configured a particular exit, thereby
* making the local address meaningful. */
if (options->ClientRejectInternalAddresses &&
diff --git a/src/or/dirserv.c b/src/or/dirserv.c
index 4d349dd..71dcbb6 100644
--- a/src/or/dirserv.c
+++ b/src/or/dirserv.c
@@ -3209,7 +3209,7 @@ dirserv_orconn_tls_done(const tor_addr_t *addr,
if (!authdir_mode_bridge(get_options()) ||
ri->purpose == ROUTER_PURPOSE_BRIDGE) {
char addrstr[TOR_ADDR_BUF_LEN];
- /* This is a bridge or we're not a bridge authorititative --
+ /* This is a bridge or we're not a bridge authority --
mark it as reachable. */
log_info(LD_DIRSERV, "Found router %s to be reachable at %s:%d. Yay.",
router_describe(ri),
diff --git a/src/or/or.h b/src/or/or.h
index d4d7a58..00031a8 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -4533,7 +4533,7 @@ typedef struct {
* XXXX Eventually, the default will be 0. */
int ExitRelay;
- /** For how long (seconds) do we declare our singning keys to be valid? */
+ /** For how long (seconds) do we declare our signing keys to be valid? */
int SigningKeyLifetime;
/** For how long (seconds) do we declare our link keys to be valid? */
int TestingLinkCertLifetime;
diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index fb8056c..78e7d02 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -4585,7 +4585,7 @@ router_exit_policy_rejects_all(const routerinfo_t *router)
return router->policy_is_reject_star;
}
-/** Create an directory server at <b>address</b>:<b>port</b>, with OR identity
+/** Create a directory server at <b>address</b>:<b>port</b>, with OR identity
* key <b>digest</b> which has DIGEST_LEN bytes. If <b>address</b> is NULL,
* add ourself. If <b>is_authority</b>, this is a directory authority. Return
* the new directory server entry on success or NULL on failure. */
More information about the tor-commits
mailing list