* commit 'tor-0.2.2.13-alpha':
  bump to 0.2.2.13-alpha
  prepare the 0.2.2.13-alpha changelog
  windows packaging cleanups from phobos
  close idle tls conns early
  blurbs for two recent alphas
  finally get rid of "clique mode"
  close idle dir-fetch circs early
  finally get rid of "clique mode"
  stop authority reachability check on startup
  immediate reachability check for new relays
  windows packaging cleanups from phobos
  more logging when tracking missing descriptors
  bump to 0.2.2.12-alpha-dev

* debian-merge:
  New upstream version
  merge in the bug 1364 fix
  Demote a warning about missing client ciphers
  bump to 0.2.2.12-alpha
  prepare for 0.2.2.12-alpha
  fetch descriptors from the authority that told us about them
  fetch unknown descriptors if we see them in a vote
  minor cleanups
  Switch geoip_get_request_history to asprintf; fix bug 1365
  fix "Got a certificate for ?? that we already have"
  Fix a compilation warning on compat_libevent.c on some versions of windows libevent
  Move the declaration of bandwidth_rate_rule_to_string
  Fix two compile-blockers in tor_vasprintf().
  bump to 0.2.2.11-alpha-dev
  parameterize update_consensus_router_descriptor_downloads

* commit 'tor-0.2.2.12-alpha':
  merge in the bug 1364 fix
  Demote a warning about missing client ciphers
  bump to 0.2.2.12-alpha
  prepare for 0.2.2.12-alpha
  fetch descriptors from the authority that told us about them
  fetch unknown descriptors if we see them in a vote
  minor cleanups
  Switch geoip_get_request_history to asprintf; fix bug 1365
  fix "Got a certificate for ?? that we already have"
  Fix a compilation warning on compat_libevent.c on some versions of windows libevent
  Move the declaration of bandwidth_rate_rule_to_string
  Fix two compile-blockers in tor_vasprintf().
  bump to 0.2.2.11-alpha-dev
  parameterize update_consensus_router_descriptor_downloads

what's happening here is that we're fetching certs for obsolete
authorities -- probably legacy signers in this case. but try to
remain general in the log message.

It's natural for the definition of bandwidth_rule_t to be with the functions
that actually care about its values.  Unfortunately, this means declaring
bandwidth_rate_rule_to_string() out of sequence.  Someday we'll just rename
reasons.c to strings.c, and put it at the end of or.h, and this will all be
better.

1) mingw doesn't have _vscprintf(); mingw instead has a working snprintf.

2) windows compilers that _do_ have a working _vscprintf spell it so; they do
   not spell it _vcsprintf().

* debian-merge: (31 commits)
  New upstream version
  bump to 0.2.2.11-alpha
  gather together the 0.2.2.11-alpha changelog
  simplify a path in networkstatus
  Add --enable-static-zlib option
  Fix renegotiation on OpenSSL versions that backport RFC5746.
  Rename CircPriorityHalflifeMsec to CircuitPriorityHalflifeMsec
  testsuite: Prevent the main thread from starving the worker threads
  testsuite: Only free the main mutex when and if all the worker threads are done
  Log bandwidth_weight_rule_t as a string, not an integer.
  Fix a bug in reading CircPriorityHalflife from consensus
  fetch relay descriptors from v3 authorities
  Fix a segfault when a client is hup'd.
  fold in the recent changelog entries
  Mention libxml2-utils in our asciidoc dependencies
  Segfault less during consensus generation without params
  Add a missing NL to dir-spec.
  In the glorious future, all relays cache dir info.
  give us a blurb; add stanza to the releasenotes
  bump to 0.2.1.25
  ...

* commit 'tor-0.2.2.11-alpha': (30 commits)
  bump to 0.2.2.11-alpha
  gather together the 0.2.2.11-alpha changelog
  simplify a path in networkstatus
  Add --enable-static-zlib option
  Fix renegotiation on OpenSSL versions that backport RFC5746.
  Rename CircPriorityHalflifeMsec to CircuitPriorityHalflifeMsec
  testsuite: Prevent the main thread from starving the worker threads
  testsuite: Only free the main mutex when and if all the worker threads are done
  Log bandwidth_weight_rule_t as a string, not an integer.
  Fix a bug in reading CircPriorityHalflife from consensus
  fetch relay descriptors from v3 authorities
  Fix a segfault when a client is hup'd.
  fold in the recent changelog entries
  Mention libxml2-utils in our asciidoc dependencies
  Segfault less during consensus generation without params
  Add a missing NL to dir-spec.
  In the glorious future, all relays cache dir info.
  give us a blurb; add stanza to the releasenotes
  bump to 0.2.1.25
  fix some dangling refs in dirspec
  ...