Merge branch 'debian-merge' into debian

* 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
  ...