Merge branch 'maint-0.3.2'

changes/bug23682

@@ -0,0 +1,5 @@
+  o Minor bugfixes (entry guards):
+    - Tor now updates its guard state when it reads a consensus regardless of
+      whether it's missing descriptors. That makes tor use its primary guards
+      to fetch descriptors in some edge cases where it would have used fallback
+      directories in the past. Fixes bug 23862; bugfix on 0.3.0.1-alpha.

changes/stack

@@ -0,0 +1,7 @@
+  o Minor bugfixes (correctness):
+    - Fix several places in our codebase where a C compiler would be likely
+      to eliminate a check, based on assuming that undefined behavior had not
+      happened elsewhere in the code.  These cases are usually a sign of
+      redundant checking, or dubious arithmetic. Found by Georg Koppen using
+      the "STACK" tool from Wang, Zeldovich, Kaashoek, and
+      Solar-Lezama. Fixes bug 24423; bugfix on various Tor versions.