Merge branch 'maint-0.4.2' into release-0.4.2

ChangeLog

@@ -5300,7 +5300,7 @@ Changes in version 0.3.4.1-alpha - 2018-05-17
     - Remove duplicate code in parse_{c,s}method_line and bootstrap
       their functionalities into a single function. Fixes bug 6236;
       bugfix on 0.2.3.6-alpha.
-    - We remove the PortForwsrding and PortForwardingHelper options,
+    - We remove the PortForwarding and PortForwardingHelper options,
       related functions, and the port_forwarding tests. These options
       were used by the now-deprecated Vidalia to help ordinary users
       become Tor relays or bridges. Closes ticket 25409. Patch by
@@ -11902,7 +11902,7 @@ Changes in version 0.2.9.3-alpha - 2016-09-23
       HiddenServiceNonAnonymousMode options. When both are set to 1,
       every hidden service on a Tor instance becomes a non-anonymous
       Single Onion Service. Single Onions make one-hop (direct)
-      connections to their introduction and renzedvous points. One-hop
+      connections to their introduction and rendezvous points. One-hop
       circuits make Single Onion servers easily locatable, but clients
       remain location-anonymous. This is compatible with the existing
       hidden service implementation, and works on the current tor
@@ -12405,13 +12405,12 @@ Changes in version 0.2.9.1-alpha - 2016-08-08
       needless crash bugs. Closes ticket 18613.
 
   o Minor features (performance):
-    - Changer the "optimistic data" extension from "off by default" to
+    - Change the "optimistic data" extension from "off by default" to
       "on by default". The default was ordinarily overridden by a
       consensus option, but when clients were bootstrapping for the
       first time, they would not have a consensus to get the option
-      from. Changing this default When fetching a consensus for the
-      first time, use optimistic data. This saves a round-trip during
-      startup. Closes ticket 18815.
+      from. Changing this default saves a round-trip during startup.
+      Closes ticket 18815.
 
   o Minor features (relay, usability):
     - When the directory authorities refuse a bad relay's descriptor,

ReleaseNotes

@@ -3469,7 +3469,7 @@ Changes in version 0.3.4.8 - 2018-09-10
     - Remove duplicate code in parse_{c,s}method_line and bootstrap
       their functionalities into a single function. Fixes bug 6236;
       bugfix on 0.2.3.6-alpha.
-    - We remove the PortForwsrding and PortForwardingHelper options,
+    - We remove the PortForwarding and PortForwardingHelper options,
       related functions, and the port_forwarding tests. These options
       were used by the now-deprecated Vidalia to help ordinary users
       become Tor relays or bridges. Closes ticket 25409. Patch by

src/feature/hibernate/hibernate.c

@@ -67,7 +67,7 @@ static hibernate_state_t hibernate_state = HIBERNATE_STATE_INITIAL;
 /** If are hibernating, when do we plan to wake up? Set to 0 if we
  * aren't hibernating. */
 static time_t hibernate_end_time = 0;
-/** If we are shutting down, when do we plan finally exit? Set to 0 if we
+/** If we are shutting down, when do we plan to finally exit? Set to 0 if we
  * aren't shutting down. (This is obsolete; scheduled shutdowns are supposed
  * to happen from mainloop_schedule_shutdown() now.) */
 static time_t shutdown_time = 0;
@@ -562,7 +562,7 @@ time_to_record_bandwidth_usage(time_t now)
   /* Note every 600 sec */
 #define NOTE_INTERVAL (600)
   /* Or every 20 megabytes */
-#define NOTE_BYTES 20*(1024*1024)
+#define NOTE_BYTES (20*1024*1024)
   static uint64_t last_read_bytes_noted = 0;
   static uint64_t last_written_bytes_noted = 0;
   static time_t last_time_noted = 0;
@@ -815,7 +815,7 @@ hibernate_soft_limit_reached(void)
    * We want to stop accepting connections when ALL of the following are true:
    *   - We expect to use up the remaining bytes in under 3 hours
    *   - We have used up 95% of our bytes.
-   *   - We have less than 500MB of bytes left.
+   *   - We have less than 500MBytes of bytes left.
    */
   uint64_t soft_limit = (uint64_t) (acct_max * SOFT_LIM_PCT);
   if (acct_max > SOFT_LIM_BYTES && acct_max - SOFT_LIM_BYTES > soft_limit) {

src/feature/rend/rendservice.c

@@ -3999,7 +3999,7 @@ remove_invalid_intro_points(rend_service_t *service,
        * accounted for when considiring uploading a descriptor. */
       intro->circuit_established = 0;
 
-      /* Node is gone or we've reached our maximum circuit creationg retry
+      /* Node is gone or we've reached our maximum circuit creation retry
        * count, clean up everything, we'll find a new one. */
       if (node == NULL ||
           intro->circuit_retries >= MAX_INTRO_POINT_CIRCUIT_RETRIES) {