Merge branch 'debian-merge-0.2.9' into debian

* debian-merge-0.2.9:
  New upstream version: 0.2.9.6-rc
  expand a bit on the resolve_my_address issue
  Pick a release date.
  test_single_onion_poisoning: Free dir[12] on all paths
  Bump to 0.2.9.6-rc
  Bump to 0.2.8.10
  spelling fix
  Start 0.2.9.6-rc changelog
  Stop ignoring hidden service key anonymity when first starting tor
  Update unit tests for 20484, 20529
  Try to work around breakage in the OSX 10.12 SDK.
  Refactor rend_service_check_dir_and_add
  Refactor duplicate code out of rend_config_services
  Create HS directories in rend_config_services, then check before use
  don't attempt a resolve when the cached answer will do
  refactor router_pick_published_address to have another arg
  Changes file for bug 20634
  fixup! Add expect_log_msg_containing_either3() and expect_log_msg_containing_either4()
  Add all four error messages to test_address_get_if_addrs6_list_no_internal()
  Add all four error messages to test_address_get_if_addrs6_list_internal()
  Add expect_log_msg_containing_either3() and expect_log_msg_containing_either4()
  Fix grammar in HiddenServiceSingleHopMode description
  Stop logging single onion and Tor2web long-term one-hop circuits
  In torrc.sample.in, note that bandwidth must be >=75 KB.
  Call get_options() once at the top of circuit_log_ancient_one_hop_circuits()
  Use va_copy() in pure-windows version of tor_asprintf().
  Bump version to 0.2.9.5-alpha-dev
  policy_is_reject_star():