Merge branch 'debian-merge' into debian

* 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