Drop FallbackNetworkstatusFile; it never worked.
Bug 3443: Don't count ORconn setup in circuit build time.

Also, add a hack Roger suggested where we're more patient if no circuits are
opened yet.
Merge branch 'bug3443_squashed'
Merge remote-tracking branch 'public/bug6887'
Merge branch 'bug7306'
Merge remote-tracking branch 'karsten/task-6266'
Expand the manpage to say: watch out for nonlocal socks

This clears up the remaining issue stopping me from closing bug 6297.
Fix infinite loop in circuit_expire_bulding

Fixes bug 7663; bug introduced in 42e3c04a7a5fb47a9.  Not in any
released version of Tor.
Merge branch 'win64-7260'

Conflicts:
	src/or/dns.c
Fix some wide lines
Add the ability to count circuit timeouts for guards.

This is purely for informational reasons for debugging.
Update pathbias parameters to match Proposal 209.

Needs manpage update and testing still..
Add log message checks for different rates.

May want to squash this forward or back..
Update Path Bias log messages to match Proposal 209.
Refactor pathbias functions to use pathbias_should_count.
Fix spaces.
Update with code review changes from Nick.
Update manpage for new PathBias torrc options.
Add a changes file for bug7157.
Fix an assert crash and an incorrectly placed return.