Merge branch 'maint-0.2.2'

Conflicts:

	src/or/config.c

changes/bug2050

@@ -0,0 +1,5 @@
+  o Major bugfixes:
+    - Learn our external IP address when we're a relay or bridge, even if
+      we set PublishServerDescriptor to 0. Bugfix on 0.2.0.3-alpha,
+      where we introduced bridge relays that don't need to publish to
+      be useful. Fixes bug 2050.

src/or/config.c

@@ -2439,7 +2439,7 @@ resolve_my_address(int warn_severity, or_options_t *options,
   }
 
   addr_string = tor_dup_ip(addr);
-  if (is_internal_IP(addr, 0) && options->_PublishServerDescriptor) {
+  if (is_internal_IP(addr, 0)) {
     /* make sure we're ok with publishing an internal IP */
     if (!options->DirServers && !options->AlternateDirAuthority) {
       /* if they are using the default dirservers, disallow internal IPs