Merge branch 'maint-0.2.7'

changes/bug14821

@@ -1,4 +1,4 @@
   o Major bugfixes (compilation):
-    - Correctly repair hardened builds under the clang compiler. Previously,
+    - Repair hardened builds under the clang compiler. Previously,
       our use of _FORTIFY_SOURCE would conflict with clang's address
-      sanitizer. Closes ticket 14821.
+      sanitizer. Fixes bug 14821; bugfix on 0.2.5.4-alpha.

changes/bug18162

@@ -1,7 +1,7 @@
   o Major bugfixes (security, pointers):
 
     - Avoid a difficult-to-trigger heap corruption attack when extending
-      a smartlist to contain over 16GB of pointers. Fixes bug #18162;
+      a smartlist to contain over 16GB of pointers. Fixes bug 18162;
       bugfix on Tor 0.1.1.11-alpha, which fixed a related bug
       incompletely. Reported by Guido Vranken.
 

changes/geoip-march2016

@@ -1,4 +1,4 @@
-  o Minor features:
+  o Minor features (geoip):
     - Update geoip and geoip6 to the March 3 2016 Maxmind GeoLite2
       Country database.