Merge branch 'debian-merge' into debian

* debian-merge:
  New upstream version
  Bump version to Tor 0.2.3.10-alpha
  Changelog and blurb for 0.2.3.10-alpha
  Add a fix for the buf_pullup bug that Vektor reported
  Start a section for the 0.2.3.10-alpha changelog
  Don't crash on startup of a dormant relay
  Fix compilation of natpmp-helper on non-windows
  Remove comment complaining that we try to attach all streams to circs
  Clear stream-isolation state on rend circs if needed to attach streams
  Refactor stream attachment in circuit_has_opened
  bump to 0.2.3.9-alpha-dev