We are doing this merge to avoid taking the patch from
"nickm/disable_pathbias_warnings_v2" into 0.2.4 -- we're going to try
to fix the pathbias code for real here.

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.

Jim Meyering authored 12 years ago and Nick Mathewson committed 12 years ago

(commit message by nickm)

This comes at the cost of making its failure message a little less
friendly, but since when do assertion failures count as
user-friendly?

Automake 1.7 is too broken to even investigate why it broke at this point.

Move extend_info_from_router() from circuitbuild.c to router.c and
make it static.

Add get_configured_bridge_by_orports_digest() and have
get_configured_bridge_by_routerinfo() and
node_is_a_configured_bridge() use it. We now consider all OR ports of
a bridge when looking for it.

Move node_get_*_orport to nodelist.c.

Fix a cut'n'paste error in header of nodelist.h.

Add node_assert_ok().

Add router_get_all_orports(). It's duplicating code from
node_get_all_orports(). Worth fixing at the cost of complicating the
API slightly?

Jim Meyering authored 12 years ago and Nick Mathewson committed 12 years ago

(commit message by nickm)

Jim Meyering authored 12 years ago and Nick Mathewson committed 12 years ago

Apparently the former will stop working with newer auto*

(commit message by nickm)

Peter Palfrader authored 12 years ago and Nick Mathewson committed 12 years ago

(Forward-port from release-0.2.2 to master)

The my_apparent_addr is still unused, apart from now being logged in
the "Got good NETINFO cell" info message.

There was some code in the "err:" block that would always log a
warning, reporting an "unknown error" if we hadn't set err_msg.  But
there were also plenty of "goto err" blocks that did their own
logging, and never set err_msg at all.  Now we should only log when
we have an error message to log.

This fixes bug 6638, from no released Tor version.

Closes #6364.