Merge commit 'origin/maint-0.2.1'

ChangeLog

@@ -34,6 +34,9 @@ Changes in version 0.2.1.16-?? - 2009-??-??
     - Disable some debugging checks that appeared in exit node profile
       data.
 
+  o Minor features:
+    - Update to the "June 3 2009" ip-to-country file.
+
   o Minor bugfixes (on 0.2.0.x):
     - Log correct error messages for DNS-related network errors on
       Windows.
@@ -43,6 +46,9 @@ Changes in version 0.2.1.16-?? - 2009-??-??
     - Fix a race condition that could cause crashes or memory
       corruption when running as a server with a controller listening
       for log messages.
+    - Avoid crashing when we have a policy specified in a DirPolicy or
+      SocksPolicy or ReachableAddresses option with ports set on it, and we
+      re-load the policy.  May fix bug 996.
 
   o Minor bugfixes (on 0.2.1.x):
     - When switching back and forth between bridge mode, do not start

src/or/policies.c

@@ -411,6 +411,7 @@ load_policy_from_option(config_line_t *config, smartlist_t **policy,
         memcpy(&newp, n, sizeof(newp));
         newp.prt_min = 1;
         newp.prt_max = 65535;
+        newp.is_canonical = 0;
         c = addr_policy_get_canonical_entry(&newp);
         SMARTLIST_REPLACE_CURRENT(*policy, n, c);
         addr_policy_free(n);