Merge remote-tracking branch 'origin/maint-0.2.2'

changes/bug3175

@@ -0,0 +1,7 @@
+  o Minor bugfixes:
+    - Resolve an untriggerable issue in smartlist_string_num_isin(),
+      where if the function had ever in the future been used to check
+      for the presence of a too-large number, it would have given an
+      incorrect result.  (Fortunately, we only used it for 16-bit
+      values.)  Fixes bug 3175; bugfix on Tor 0.1.0.1-rc.
+

src/common/container.c

@@ -210,7 +210,7 @@ smartlist_string_isin_case(const smartlist_t *sl, const char *element)
 int
 smartlist_string_num_isin(const smartlist_t *sl, int num)
 {
-  char buf[16];
+  char buf[32]; /* long enough for 64-bit int, and then some. */
   tor_snprintf(buf,sizeof(buf),"%d", num);
   return smartlist_string_isin(sl, buf);
 }