No longer install contrib/tor-tsocks.conf into /etc/tor - it was dropped upstream.

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

tag 0.2.4.11-alpha

* tag 'tor-0.2.4.11-alpha': (103 commits)
  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.
  Test alternate values of maxunmeasuredbw too
  ...

also, snap the start time and end time to a day boundary, since most
certs in the wild seem to do this.

resolves ticket 8443.

no actual changes in behavior yet

since it's only enableable by authorities, nobody else would be able
to start their tor

Nick Mathewson authored 12 years ago and Roger Dingledine committed 12 years ago

I have no idea whether b0rken clients will DoS the network if the v2
authorities all turn this on or not.  It's experimental. See #6783 for
a description of how to test it more or less safely, and please be
careful!

Now that circid_t is 4 bytes long, the default integer promotions will
leave it alone when sizeof(int) == 4, which will leave us formatting an
unsigned as an int.  That's technically undefined behavior.

Fixes bug 8447 on bfffc1f0.  Bug not
in any released Tor.

Andrea Shepard authored 12 years ago and Nick Mathewson committed 12 years ago

                    (Second part of a bug8367 fix. -NM)

This fixes bug 8367, introduced in d7089ff2. Not in
any released Tor.

We don't use subversion or src/*/makefile.am any longer

This should prevent crashes on further recurrence of 8065, and help
diagnose such if they occur

This patch moves the measured_bw field and the has_measured_bw field
into vote_routerstatus_t, since only votes have 'Measured=XX' set on
their weight line.

I also added a new bw_is_unmeasured flag to routerstatus_t to
represent the Unmeasured=1 flag on a w line.  Previously, I was using
has_measured_bw for this, which was quite incorrect: has_measured_bw
means that the measured_bw field is set, and it's probably a mistake
to have it serve double duty as meaning that 'baandwidth' represents a
measured value.

While making this change,I also found a harmless but stupid bug in
dirserv_read_measured_bandwidths: It assumes that it's getting a
smartlist of routerstatus_t, when really it's getting a smartlist of
vote_routerstatus_t.  C's struct layout rules mean that we could never
actually get an error because of that, but it's still quite incorrect.
I fixed that, and in the process needed to add two more sorting and
searching helpers.

Finally, I made the Unmeasured=1 flag get parsed.  We don't use it for
anything yet, but someday we might.

This isn't complete yet -- the new 2286 unit test doesn't build.