Merge branch 'debian-merge' into debian

* debian-merge: (104 commits)
  New upstream version: 0.2.4.11-alpha
  fold in changes entry
  bump to 0.2.4.11-alpha
  fold in changes entries so far
  start part-way through the ssl cert lifetime
  randomize SSLKeyLifetime by default
  parameterize SSLKeyLifetime
  Fix typos in a few log messages
  set DisableV2DirectoryInfo_ off by default
  Tweak bug6783 patch.
  Add a DisableV2DirectoryInfo_ option to 404 all v2 ns requests
  Fix 8447: use %u to format circid_t.
  Update to the March 2013 GeoIP database.
  Correctly set entry->is_dir_cache when adding an entry guard for the first time
  Fix bootstrapping with bridges by making is_dir_cache is set on them.
  update the in-progress bandwidth requirements for authorities
  Fix a comment in tor_main.c
  fix a wide line
  Downgrade an assert to LD_BUG
  Fix a may-be-used-uninitialized warning.
  ...