Merge pull request #739 from ianmacd/pr1

Display the service node's IP address after its country.

app/src/main/java/org/thoughtcrime/securesms/util/IP2Country.kt

@@ -99,7 +99,7 @@ class IP2Country private constructor(private val context: Context) {
 
         val bestMatchCountry = comps.lastOrNull { it.key <= Ipv4Int(ip)  }?.let { (_, code) ->
             if (code != null) {
-                countryToNames[code]
+                countryToNames[code] + " [" + ip + "]"
             } else {
                 null
             }
@@ -126,4 +126,4 @@ class IP2Country private constructor(private val context: Context) {
         }
     }
     // endregion
-}
+}