summaryrefslogtreecommitdiff
path: root/src/app
diff options
context:
space:
mode:
Diffstat (limited to 'src/app')
-rw-r--r--src/app/config/config.c8
-rw-r--r--src/app/config/or_options_st.h2
-rw-r--r--src/app/config/or_state_st.h2
-rw-r--r--src/app/config/resolve_addr.h2
4 files changed, 7 insertions, 7 deletions
diff --git a/src/app/config/config.c b/src/app/config/config.c
index e14437aa6f..458067af4d 100644
--- a/src/app/config/config.c
+++ b/src/app/config/config.c
@@ -1518,7 +1518,7 @@ compute_group_readable_flag(const char *datadir,
* the datadirectory */
return datadir_gr;
} else {
- /* The directores are different, so we default to "not group-readable" */
+ /* The directories are different, so we default to "not group-readable" */
return 0;
}
}
@@ -5872,9 +5872,9 @@ warn_client_dns_cache(const char *option, int disabling)
return;
warn_deprecated_option(option,
- "Client-side DNS cacheing enables a wide variety of route-"
+ "Client-side DNS caching enables a wide variety of route-"
"capture attacks. If a single bad exit node lies to you about "
- "an IP address, cacheing that address would make you visit "
+ "an IP address, caching that address would make you visit "
"an address of the attacker's choice every time you connected "
"to your destination.");
}
@@ -7009,7 +7009,7 @@ options_get_dir_fname2_suffix,(const or_options_t *options,
return fname;
}
-/** Check wether the data directory has a private subdirectory
+/** Check whether the data directory has a private subdirectory
* <b>subdir</b>. If not, try to create it. Return 0 on success,
* -1 otherwise. */
int
diff --git a/src/app/config/or_options_st.h b/src/app/config/or_options_st.h
index 7a72547fd3..4364f145ed 100644
--- a/src/app/config/or_options_st.h
+++ b/src/app/config/or_options_st.h
@@ -1041,7 +1041,7 @@ struct or_options_t {
/** Maximum allowed burst of circuits. Reaching that value, the address is
* detected as malicious and a defense might be used. */
int DoSCircuitCreationBurst;
- /** When an address is marked as malicous, what defense should be used
+ /** When an address is marked as malicious, what defense should be used
* against it. See the dos_cc_defense_type_t enum. */
int DoSCircuitCreationDefenseType;
/** For how much time (in seconds) the defense is applicable for a malicious
diff --git a/src/app/config/or_state_st.h b/src/app/config/or_state_st.h
index 6769ef7b87..807f546169 100644
--- a/src/app/config/or_state_st.h
+++ b/src/app/config/or_state_st.h
@@ -21,7 +21,7 @@ struct config_suite_t;
struct or_state_t {
uint32_t magic_;
/** The time at which we next plan to write the state to the disk. Equal to
- * TIME_MAX if there are no savable changes, 0 if there are changes that
+ * TIME_MAX if there are no saveable changes, 0 if there are changes that
* should be saved right away. */
time_t next_write;
diff --git a/src/app/config/resolve_addr.h b/src/app/config/resolve_addr.h
index 96c86eeeea..919d5d42cc 100644
--- a/src/app/config/resolve_addr.h
+++ b/src/app/config/resolve_addr.h
@@ -17,7 +17,7 @@
/** Method used to resolved an address. In other words, how was the address
* discovered by tor. */
typedef enum {
- /* Default value. Indiate that no method found the address. */
+ /* Default value. Indicate that no method found the address. */
RESOLVED_ADDR_NONE = 0,
/* Found from the "Address" configuration option. */
RESOLVED_ADDR_CONFIGURED = 1,