reduce same-country bonus, less countries

router/java/src/net/i2p/router/peermanager/CapacityCalculator.java

@@ -22,7 +22,7 @@ class CapacityCalculator {
     // crappy peers start at 1 and the base is 5.
     private static final double BONUS_NEW = 0.85;
     private static final double BONUS_ESTABLISHED = 0.65;
-    private static final double BONUS_SAME_COUNTRY = 0.25;
+    private static final double BONUS_SAME_COUNTRY = 0.10;
     private static final double BONUS_XOR = .25;
     private static final double PENALTY_UNREACHABLE = 2;
     

router/java/src/net/i2p/router/peermanager/PeerProfile.java

@@ -76,7 +76,7 @@ public class PeerProfile {
     private static final Set<String> _bigCountries = new HashSet();
 
     static {
-        String[] big = new String[] {"ca", "fi", "fr", "de", "ru", "se", "ua", "gb", "us" };
+        String[] big = new String[] { "fr", "de", "ru", "ua", "us" };
         _bigCountries.addAll(Arrays.asList(big));
     }