Merge branch 'debian-merge' into debian

* debian-merge: (73 commits)
  New upstream version
  improve rpm init script by borrowing from Debian
  Update rpm spec file so that it will build without manual intervention on all rpm-based distributions
  AUTHORS doesn't exist, so stop trying to cp it. Add 'sudo' to a mv that needs higher permissions.
  bump to 0.2.2.17-alpha
  write up a changelog file
  Add a changes file for the bug1912 fix
  Note an XXX about potential overflow
  Use an upper and lower bound for bridge weights
  Fix check-spaces
  Nominaly lower the minimum timeout value to 1500.
  fix two casts
  Comment network liveness and change detection behavior.
  no measurement circs if not enough build times
  refactor and recomment; no actual changes
  Add changes file.
  Cap the circuit build timeout to the max time we've seen.
  Do away with the complexity of the network liveness detection.
  Fix state checks on liveness handling.
  Fix non-live condition checks.
  ...