* debian-merge: (84 commits)
  New upstream version
  Fix a compile warning on 64bit OS X
  bump to 0.2.3.8-alpha
  add a blurb for 0.2.3.8-alpha
  and rm the old ones
  fold in more changes files
  update the man page for the new AuthDirFastGuarantee value
  raise AuthDirFastGuarantee from 20KB to 100KB
  apparently or_options_t likes being a const in master
  man page entries for AuthDir{Fast,GuardBW}Guarantee
  parameterize bw cutoffs to guarantee Fast and Guard flags
  fold in more changes entries
  further cleanups
  fold in more changes entries
  Changes file for bug4360
  Changes file for bug4521 backports.
  Sockets are unsigned on windows
  Log more loudly on a bad cert from an authority.
  Get rid of an unused parameter warning on win
  changes file for bug4515
  ...

* commit 'tor-0.2.3.8-alpha': (83 commits)
  Fix a compile warning on 64bit OS X
  bump to 0.2.3.8-alpha
  add a blurb for 0.2.3.8-alpha
  and rm the old ones
  fold in more changes files
  update the man page for the new AuthDirFastGuarantee value
  raise AuthDirFastGuarantee from 20KB to 100KB
  apparently or_options_t likes being a const in master
  man page entries for AuthDir{Fast,GuardBW}Guarantee
  parameterize bw cutoffs to guarantee Fast and Guard flags
  fold in more changes entries
  further cleanups
  fold in more changes entries
  Changes file for bug4360
  Changes file for bug4521 backports.
  Sockets are unsigned on windows
  Log more loudly on a bad cert from an authority.
  Get rid of an unused parameter warning on win
  changes file for bug4515
  Only call cull_wedged_cpuworkers once every 60 seconds.
  ...

This patch reverts part of 39ceda7e (where it used to be 100KB).

Conflicts:
	src/or/dirserv.c

Now it will be easier for researchers to simulate Tor networks with
different values. Resolves ticket 4484.

this gets rid of a warning about signed/unsigned comparison

This is a backport of 0a5338e0 that
accidentally only went into master

Clock skew made this situation way too frequent so we demoted it to
"protocol_warn", but when there's an authority, it should really just
be warn.

This is a backport of bed79c47 which
accidentally only went into master

The function is over 10 or 20% on some of Moritz's profiles, depending
on how you could.

Since it's checking for a multi-hour timeout, this is safe to do.

Fixes bug 4518.

In particular:
* Disallow "0x10::"
* Don't blow up on ":"
* Disallow "::10000"

Completely disable stats if we aren't running as a relay. We won't
collect any anyway, so setting up the infrastructure for them and
logging about them is wrong. This also removes a confusing log
message that clients without a geoip db would have seen.

Fixes bug 4353.

somebody should s/authoritative directory server/directory authority/g
at some point