Spelling fixes in comments and strings

4 files changed, 10 insertions, 10 deletions

diff --git a/src/common/mempool.c b/src/common/mempool.c
index bbfa3c256a..60fcb2ca7a 100644
--- a/src/common/mempool.c
+++ b/src/common/mempool.c
@@ -54,7 +54,7 @@
  *   - One pointer overhead per allocated thing.  (The alternative is
  *     something like glib's use of an RB-tree to keep track of what
  *     chunk any given piece of memory is in.)
- *   - Only aligns allocated things to void* level: redefign ALIGNMENT_TYPE
+ *   - Only aligns allocated things to void* level: redefine ALIGNMENT_TYPE
  *     if you need doubles.
  *   - Could probably be optimized a bit; the representation contains
  *     a bit more info than it really needs to have.
diff --git a/src/common/torgzip.c b/src/common/torgzip.c
index 196f5521f7..762f2e71bf 100644
--- a/src/common/torgzip.c
+++ b/src/common/torgzip.c
@@ -365,7 +365,7 @@ tor_zlib_new(int compress, compress_method_t method)
  return NULL;
 }
 
-/** Compress/decommpress some bytes using <b>state</b>.  Read up to
+/** Compress/decompress some bytes using <b>state</b>.  Read up to
  * *<b>in_len</b> bytes from *<b>in</b>, and write up to *<b>out_len</b> bytes
  * to *<b>out</b>, adjusting the values as we go.  If <b>finish</b> is true,
  * we've reached the end of the input.
diff --git a/src/common/tortls.c b/src/common/tortls.c
index 581b35848a..f14eab18a5 100644
--- a/src/common/tortls.c
+++ b/src/common/tortls.c
@@ -26,7 +26,7 @@
 #include <openssl/opensslv.h>
 
 #if OPENSSL_VERSION_NUMBER < 0x00907000l
-#error "We require openssl >= 0.9.7"
+#error "We require OpenSSL >= 0.9.7"
 #endif
 
 #define CRYPTO_PRIVATE /* to import prototypes from crypto.h */
@@ -70,7 +70,7 @@ struct tor_tls_t {
   tor_tls_context_t *context; /** A link to the context object for this tls. */
   SSL *ssl; /**< An OpenSSL SSL object. */
   int socket; /**< The underlying file descriptor for this TLS connection. */
-  char *address; /**< An address to log when describing this connectinon. */
+  char *address; /**< An address to log when describing this connection. */
   enum {
     TOR_TLS_ST_HANDSHAKE, TOR_TLS_ST_OPEN, TOR_TLS_ST_GOTCLOSE,
     TOR_TLS_ST_SENTCLOSE, TOR_TLS_ST_CLOSED, TOR_TLS_ST_RENEGOTIATE,
@@ -454,7 +454,7 @@ tor_tls_create_certificate(crypto_pk_env_t *rsa,
 #define CIPHER(id, name) name ":"
 #define XCIPHER(id, name)
 /** List of ciphers that clients should advertise, omitting items that
- * our openssl doesn't know about. */
+ * our OpenSSL doesn't know about. */
 static const char CLIENT_CIPHER_LIST[] =
 #include "./ciphers.inc"
   ;
@@ -464,7 +464,7 @@ static const char CLIENT_CIPHER_LIST[] =
 /** Holds a cipher that we want to advertise, and its 2-byte ID. */
 typedef struct cipher_info_t { unsigned id; const char *name; } cipher_info_t;
 /** A list of all the ciphers that clients should advertise, including items
- * that openssl might not know about. */
+ * that OpenSSL might not know about. */
 static const cipher_info_t CLIENT_CIPHER_INFO_LIST[] = {
 #define CIPHER(id, name) { id, name },
 #define XCIPHER(id, name) { id, #name },
@@ -879,7 +879,7 @@ tor_tls_set_logged_address(tor_tls_t *tls, const char *address)
 
 /** Set <b>cb</b> to be called with argument <b>arg</b> whenever <b>tls</b>
  * next gets a client-side renegotiate in the middle of a read.  Do not
- * invoke this function untile <em>after</em> initial handshaking is done!
+ * invoke this function until <em>after</em> initial handshaking is done!
  */
 void
 tor_tls_set_renegotiate_callback(tor_tls_t *tls,
diff --git a/src/common/util.c b/src/common/util.c
index 13c55b2888..a3338b1d18 100644
--- a/src/common/util.c
+++ b/src/common/util.c
@@ -1088,7 +1088,7 @@ format_rfc1123_time(char *buf, time_t t)
 /** Parse the the RFC1123 encoding of some time (in GMT) from <b>buf</b>,
  * and store the result in *<b>t</b>.
  *
- * Return 0 on succcess, -1 on failure.
+ * Return 0 on success, -1 on failure.
 */
 int
 parse_rfc1123_time(const char *buf, time_t *t)
@@ -1319,7 +1319,7 @@ format_time_interval(char *out, size_t out_len, long interval)
  * ===== */
 
 #ifndef TIME_IS_FAST
-/** Cached estimate of the currrent time.  Updated around once per second;
+/** Cached estimate of the current time.  Updated around once per second;
  * may be a few seconds off if we are really busy.  This is a hack to avoid
  * calling time(NULL) (which not everybody has optimized) on critical paths.
  */
@@ -1350,7 +1350,7 @@ update_approx_time(time_t now)
  * XXXX022 Use this consistently or rip most of it out.
  * ===== */
 
-/* In a perfect world, everybody would run ntp, and ntp would be perfect, so
+/* In a perfect world, everybody would run NTP, and NTP would be perfect, so
  * if we wanted to know "Is the current time before time X?" we could just say
  * "time(NULL) < X".
  *