Merge branch 'maint-0.2.8' into release-0.2.8

changes/bug19903

@@ -0,0 +1,4 @@
+  o Minor bugfixes (compilation):
+    - Remove an inappropriate "inline" in tortls.c that was causing warnings
+      on older versions of GCC. Fixes bug 19903; 0.2.8.1-alpha.
+

changes/geoip-august2016

@@ -0,0 +1,4 @@
+  o Minor features:
+    - Update geoip and geoip6 to the August 2 2016 Maxmind GeoLite2
+      Country database.
+

src/common/tortls.c

@@ -143,7 +143,7 @@ tor_tls_allocate_tor_tls_object_ex_data_index(void)
 
 /** Helper: given a SSL* pointer, return the tor_tls_t object using that
  * pointer. */
-STATIC inline tor_tls_t *
+STATIC tor_tls_t *
 tor_tls_get_by_ssl(const SSL *ssl)
 {
   tor_tls_t *result = SSL_get_ex_data(ssl, tor_tls_object_ex_data_index);