Merge f20016d into merged_master (Elements PR ElementsProject#1252)

Author: jamesdorfman

src/net_processing.cpp

@@ -2131,7 +2131,7 @@ void PeerManagerImpl::ProcessHeadersMessage(CNode& pfrom, const Peer& peer,
             if ((nodestate->pindexBestKnownBlock == nullptr) ||
                 (nodestate->pindexBestKnownBlock->nHeight < m_chainman.ActiveHeight())) {
                 // Our notion of what blocks a peer has available is based on its pindexBestKnownBlock,
-                // which is based on headers recieved from it. If we don't have one, or it's too old,
+                // which is based on headers received from it. If we don't have one, or it's too old,
                 // then we can never get blocks from this peer until we accept headers from it first.
                 LogPrint(BCLog::NET, "NOT discarding headers from peer=%d, to update its block availability. (current best header %d, active chain height %d)\n", pfrom.GetId(), pindexBestHeader->nHeight, m_chainman.ActiveHeight());
             } else {

test/lint/lint-python-utf8-encoding.sh

@@ -9,7 +9,7 @@
 
 export LC_ALL=C
 EXIT_CODE=0
-OUTPUT=$(git grep " open(" -- "*.py" ":(exclude)src/crc32c/" | grep -vE "encoding=.(ascii|utf8|utf-8)." | grep -vE "open\([^,]*, ['\"][^'\"]*b[^'\"]*['\"]")
+OUTPUT=$(git grep " open(" -- "*.py" ":(exclude)src/crc32c/" ":(exclude)src/secp256k1/" | grep -vE "encoding=.(ascii|utf8|utf-8)." | grep -vE "open\([^,]*, ['\"][^'\"]*b[^'\"]*['\"]")
 if [[ ${OUTPUT} != "" ]]; then
     echo "Python's open(...) seems to be used to open text files without explicitly"
     echo "specifying encoding=\"utf8\":"

test/lint/lint-spelling.ignore-words.txt

@@ -26,3 +26,6 @@ useable
 validata
 wit
 xwindows
+te
+ligh
+atack