"ours" merge to avoid version bump.

"ours" merge to avoid version bump.

"ours" merge to avoid version bump.

"ours" merge to avoid version bump.

David Goulet authored 7 years ago and Nick Mathewson committed 7 years ago

On an hidden service rendezvous circuit, a BEGIN_DIR could be sent
(maliciously) which would trigger a tor_assert() because
connection_edge_process_relay_cell() thought that the circuit is an
or_circuit_t but is an origin circuit in reality.

Fixes #22494

Reported-by: Roger Dingledine <arma@torproject.org>
Signed-off-by: David Goulet <dgoulet@torproject.org>

Ours merge to avoid taking 4ee48cb4

Fixes bug 22490; bugfix on 6a241ff3 in 0.2.4.6-alpha.

Found by teor using clang-5.0's AddressSanitizer stack-use-after-scope.

Replace the 177 fallbacks originally introduced in Tor 0.2.9.8 in
December 2016 (of which ~126 were still functional), with a list of
151 fallbacks (32 new, 119 existing, 58 removed) generated in May 2017.

Resolves ticket 21564.