Merge branch 'dev' into proxy

app/lib/computation/QuickSync.ts

@@ -126,7 +126,7 @@ export class QuickSynchronizer {
 
         // Remember expiration dates
         for (const entry of index) {
-          if (entry.op === 'CREATE' && (entry.expires_on || entry.revokes_on)) {
+          if (entry.expires_on || entry.revokes_on) {
             sync_expires.push(entry.expires_on || entry.revokes_on);
           }
         }

app/modules/ws2p/lib/WS2PCluster.ts

@@ -372,7 +372,10 @@ export class WS2PCluster {
       const api = p.getWS2P(imCanReachTorEndpoint)
       if (api) {
         try {
+          // We do not connect to local host
+          if (!this.server.conf.ws2p || api.uuid !== this.server.conf.ws2p.uuid) {
             await this.connectToRemoteWS(api.host, api.port, api.path, this.messageHandler, p.pubkey, api.uuid)
+          }
         } catch (e) {
           this.server.logger.debug('WS2P: init: failed connection')
         }

doc/Protocol.md

@@ -2591,7 +2591,7 @@ If `reduce(GLOBAL_CINDEX[issuer=CERT.issuer,receiver=CERT.receiver,created_on=CE
 
 ###### BR_G93 - Membership expiry
 
-For each `REDUCE_BY(GLOBAL_MINDEX[expires_on<=HEAD.medianTime], 'pub') as POTENTIAL` then consider `REDUCE(GLOBAL_MINDEX[pub=POTENTIAL.pub]) AS MS`.
+For each `REDUCE_BY(GLOBAL_MINDEX[expires_on<=HEAD.medianTime AND revokes_on>HEAD.medianTime], 'pub') as POTENTIAL` then consider `REDUCE(GLOBAL_MINDEX[pub=POTENTIAL.pub]) AS MS`.
 
 If `MS.expired_on == null OR MS.expired_on == 0`, add a new LOCAL_MINDEX entry: