EOY November Update - Matching

See torbutton#40022 (closed)