* debian-merge: (89 commits)
  New upstream version
  bump to 0.2.2.14-alpha
  guh. 'git commit' did not do what i expect.
  i'm going to tag 0.2.2.14-alpha tonight
  Rename log.h to torlog.h
  fold in the latest changes
  Remove TODO items that are either done or moved to the tracker
  More gracefully handle corrupt state files.
  Fix unittest failure in bug 1660.
  Make directory mirrors report non-zero dirreq-v[23]-shares again.
  Fix bugs with assuming time_t can be implicitly cast to long
  start an 0.2.2.14-alpha changelog
  Group in torrc is obsolete, so stop checking it
  Make cbt_generate_sample use crypto_rand_double()
  Fix a compile error when building with Libevent before 1.4.5-stable
  Use Libevent 2.0's periodic timers where available.
  Make spec docs reference RFC2119
  Fix typo in tinytest_demo
  Fix zlib macro brokenness on osx with zlib 1.2.4 and higher.
  Log an error if openssl fails to copy a key for us
  ...

* commit 'tor-0.2.2.14-alpha': (88 commits)
  bump to 0.2.2.14-alpha
  guh. 'git commit' did not do what i expect.
  i'm going to tag 0.2.2.14-alpha tonight
  Rename log.h to torlog.h
  fold in the latest changes
  Remove TODO items that are either done or moved to the tracker
  More gracefully handle corrupt state files.
  Fix unittest failure in bug 1660.
  Make directory mirrors report non-zero dirreq-v[23]-shares again.
  Fix bugs with assuming time_t can be implicitly cast to long
  start an 0.2.2.14-alpha changelog
  Group in torrc is obsolete, so stop checking it
  Make cbt_generate_sample use crypto_rand_double()
  Fix a compile error when building with Libevent before 1.4.5-stable
  Use Libevent 2.0's periodic timers where available.
  Make spec docs reference RFC2119
  Fix typo in tinytest_demo
  Fix zlib macro brokenness on osx with zlib 1.2.4 and higher.
  Log an error if openssl fails to copy a key for us
  Add a function to return a double in range [0,1).
  ...

This should make us conflict less with system files named "log.h".
Yes, we shouldn't have been conflicting with those anyway, but some
people's compilers act very oddly.

The actual change was done with one "git mv", by editing
Makefile.am, and running
   find . -name '*.[ch]' | xargs perl -i -pe 'if (/^#include.*\Wlog.h/) {s/log.h/torlog.h/; }'

Save a backup if we get odd circuitbuildtimes and other state info.

In the case of circuit build times, we no longer assert, and reset our state.

We now record large times as abandoned, to prevent a filter step from
happening and skewing our results.

Also, issue a warn for a rare case that can happen for funky values of Xm or
too many abandoned circuits. Can happen (very rarely) during unit tests, but
should not be possble during live operation, due to network liveness filters
and discard logic.

Many friendly operating systems have 64-bit times, and it's not nice
to pass them to an %ld format.

It's also extremely not-nice to write a time to the log as an
integer.  Most people think it's 2010 June 29 23:57 UTC+epsilon, not
1277855805+epsilon.

Possible workaround for bug 1139, if anybody cares.

Older versions of Libevent forgot to declare enough function arguments
constant.

These timers behave better with non-monotonic clocks than our old
ones, and also try harder to make once-per-second events get called
one second apart, rather than one-plus-epsilon seconds apart.

This fixes bug 943 for everybody using Libevent 2.0 or later.

Now people will have no excuse for not knowing what "MUST" and "MAY"
mean.  Fixes bug 1310.

From the code:
   zlib 1.2.4 and 1.2.5 do some "clever" things with macros.  Instead of
   saying "(defined(FOO) ? FOO : 0)" they like to say "FOO-0", on the theory
   that nobody will care if the compile outputs a no-such-identifier warning.

   Sorry, but we like -Werror over here, so I guess we need to define these.
   I hope that zlib 1.2.6 doesn't break these too.

Possible fix for bug 1526.

This should never happen unless openssl is buggy or some of our
assumptions are deeply wrong, but one of those might have been the
cause of the not-yet-reproducible bug 1209.  If it ever happens again,
let's get some info we can use.

We need to ensure that we close timeout measurement circuits. While
we're at it, we should close really old circuits of certain types that
aren't in use, and log really old circuits of other types.

We need to record different statistics at point of timeout, vs the point
of forcible closing.

Also, give some better names to constants and state file variables
to indicate they are not dealing with timeouts, but abandoned circuits.

Also clean up some log messages.