Merge branch 'master' of git://tinc-vpn.org/tinc into 1.1

diff --cc src/route.c
index 32be4de,666f48f..c73ac9f
--- 1/src/route.c
--- 2/src/route.c
+++ b/src/route.c
@@@ -85,10 -80,9 +85,10 @@@ static uint16_t inet_checksum(void *dat
  static bool ratelimit(int frequency) {
        static time_t lasttime = 0;
        static int count = 0;
 +      time_t now = time(NULL);
        
        if(lasttime == now) {
-               if(++count > frequency)
+               if(count >= frequency)
                        return true;
        } else {
                lasttime = now;