Merge pull request #2564 from alex/crl-index-perf

Make indexing a CRL O(1) instead of O(n).