Merge branch 'master' into compact-layout

diff --cc ui/curses.c
Simple merge

diff --cc ui/mtr.h
index 252d954112504c955d6255e8ca98124839bbc1fc,0adff62d5b7d7ac0fdc38b79257f1a4ee931f4de..7b4482b30b82d13c12b0c3246a60f88e1a3a1e4b
--- 1/ui/mtr.h
--- 2/ui/mtr.h
+++ b/ui/mtr.h
@@@ -116,7 -117,13 +117,13 @@@ struct mtr_ctl 
       ForceMaxPing:1,
          use_dns:1,
          show_ips:1,
 -        enablempls:1, dns:1, reportwide:1, Interactive:1, DisplayMode:5;
 +        enablempls:1, dns:1, reportwide:1, Interactive:1, DisplayMode:5, CompactLayout:1;
+ #ifdef HAVE_IPINFO
+ #ifdef ENABLE_IPV6
+     char *ipinfo_provider6;
+ #endif
+     char *ipinfo_provider4;
+ #endif
  };
  
  /* dynamic field drawing */