Merge branch 'debian-merge' into debian

* debian-merge: (68 commits)
  New upstream version
  final touchups
  bump to 0.2.2.18-alpha
  warn more about AllowSingleHopExits
  merge in more changelog entries
  Clean up my 1776 fix a bit
  Move controller event for socks warning into log_unsafe_socks_warning
  changes entry for nopublish removal in 5040c855
  Make the coducmentation for SingleHop stuff slightly more dire
  Rate-limit unsafe socks warning
  Avoid perma-blocking the controller on bug in shrink_freelist
  Add changes file for bug1125
  Add changes file for bug1125
  Disable logging to control port connections in buf_shrink_freelists.
  Move the original log_info call out of the core of buf_shrink_freelists.
  Disable logging to control port connections in buf_shrink_freelists.
  Move the original log_info call out of the core of buf_shrink_freelists.
  let unpublished bridges learn their ip address too
  Enforce multiplicity rules when parsing annotations.
  Fix a bug where seting allow_annotations==0 only ignores annotations, but does not block them
  ...