Failure to do so left us open to a remotely triggerable assertion
failure. Fixes CVE-2012-2249; bugfix on 0.2.3.6-alpha. Reported by
"some guy from France".

In the past we had used reason "internal", which is more vague than
it needs to be. Resolves bug 7037.

resolves bug 7022.

Also remove some trailing whitespace.

Patch from maker; fixes bug 6024.

Asserts were hit by Tor2Web mode.

We already had code on windows to fix our file sizes when we're
reading a file in text mode and its size doesn't match the size from
fstat.  But that code was only enabled when _WIN32 was defined, and
Cygwin defines __CYGWIN__ instead.

Fixes bug 6844; bugfix on 0.1.2.7-alpha.

Fixes bug 6827; bugfix on c58675ca
(when the v2 HS desc parser was implemented).

Found by asn.

This reverts commit 4aff97cf.

We don't actually want to be changing the torrc.sample on stable or
near-stable stuff, since doing so makes pointless busywork for debian
users.

Conflicts:
	src/test/test_util.c

Fixes bug 6811.

If s_values is null in rep_hist_load_bwhist_state_section, we would
call smartlist_len() on it, and die.

Fixes bug 6801.

The current cutoff is 30KB, but in reality a useful cutoff is probably
more like 50KB or 100KB.

Fix for bug 6774; bugfix on 0.2.3.17-beta.

Allow one-hop directory fetching circuits the full "circuit build timeout"
period, rather than just half of it, before failing them and marking
the relay down. This fix should help reduce cases where clients declare
relays (or worse, bridges) unreachable because the TLS handshake takes
a few seconds to complete.

Fixes bug 6743 (one piece of bug 3443); bugfix on 0.2.2.2-alpha, where
we changed the timeout from a static 30 seconds.

Bugfix for #6732.

Fix for #6251

We've had over two months to fix them, and didn't.  Now we need
0.2.3.x stable.  Yes, it would be cool to get this working in
0.2.3.x, but not at the expense of delaying every other feature that
_does_ work in 0.2.3.x.  We can do a real fix in 0.2.4.

Conflicts:
	src/or/policies.c

a router that another router wasn't already connected to.

This can create a remote crash opportunity for/against directory
authorities.

This is important, since otherwise an attacker can use timing info
to probe the internal network.

Also, add an option (ExtendAllowPrivateAddresses) so that
TestingTorNetwork won't break.

Fix for bug 6710; bugfix on all released versions of Tor.