Nick Mathewson
9be3389dc7
Merge remote-tracking branch 'origin/maint-0.2.4'
2013-03-14 12:06:58 -04:00
Nick Mathewson
653b09e1ec
Make circuit_purpose_to_string handle CIRCUIT_PURPOSE_PATH_BIAS_TESTING
2013-03-14 12:06:03 -04:00
Nick Mathewson
051b1e8ac4
Look at the right variable when warning about signed size_t.
...
In 81d69f4c2d0e597471af
2013-03-11 16:29:06 -04:00
Nick Mathewson
d89b8e0751
Merge remote-tracking branch 'karsten/geoip-manual-update-mar2013'
2013-03-11 13:34:32 -04:00
Nick Mathewson
2a02efb601
Merge remote-tracking branch 'origin/maint-0.2.4'
2013-03-11 13:32:35 -04:00
Nick Mathewson
ef4db31693
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
2013-03-11 13:32:16 -04:00
Nick Mathewson
c6ca199888
Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3
2013-03-11 13:32:01 -04:00
Roger Dingledine
331e4dcb46
Merge branch 'maint-0.2.4'
2013-03-10 23:42:14 -04:00
Roger Dingledine
0196647970
start part-way through the ssl cert lifetime
...
also, snap the start time and end time to a day boundary, since most
certs in the wild seem to do this.
2013-03-10 23:38:18 -04:00
Roger Dingledine
edd6f02273
randomize SSLKeyLifetime by default
...
resolves ticket 8443.
2013-03-10 23:38:18 -04:00
Roger Dingledine
599aeef9bc
parameterize SSLKeyLifetime
...
no actual changes in behavior yet
2013-03-10 23:38:18 -04:00
Nick Mathewson
aa3126b5b4
Merge remote-tracking branch 'origin/maint-0.2.4'
2013-03-10 23:03:17 -04:00
Nick Mathewson
e270a066a6
Merge remote-tracking branch 'arma/bug6783_big_hammer' into maint-0.2.4
2013-03-10 23:01:58 -04:00
Nick Mathewson
e4c5001bad
Merge remote-tracking branch 'origin/maint-0.2.4'
2013-03-10 23:00:13 -04:00
Benjamin Kerensa
8b4195f021
Fix typos in a few log messages
2013-03-10 22:59:19 -04:00
Roger Dingledine
f8960ea22b
set DisableV2DirectoryInfo_ off by default
...
since it's only enableable by authorities, nobody else would be able
to start their tor
2013-03-10 20:40:15 -04:00
Nick Mathewson
926b3d77f1
Tweak bug6783 patch.
2013-03-10 20:31:58 -04:00
Nick Mathewson
e4614d30e5
Add a DisableV2DirectoryInfo_ option to 404 all v2 ns requests
...
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!
2013-03-10 20:31:53 -04:00
Nick Mathewson
4235425fce
Merge remote-tracking branch 'origin/maint-0.2.4'
2013-03-10 19:53:31 -04:00
Nick Mathewson
301faf2813
Merge branch 'bug8447_squashed' into maint-0.2.4
2013-03-10 19:52:43 -04:00
Nick Mathewson
339df5df08
Fix 8447: use %u to format circid_t.
...
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 bfffc1f0fc
2013-03-10 19:52:06 -04:00
Karsten Loesing
3dde6d5d29
Update to the March 2013 GeoIP database.
2013-03-07 20:58:31 +01:00
Karsten Loesing
5cad78c2ce
Manually fix yet another fourteen 'A1' ranges.
...
MaxMind added fourteen new 'A1' ranges in their March 2013 database that
the automatic substitution algorithm couldn't fix. Fix them manually.
2013-03-07 20:55:46 +01:00
Nick Mathewson
62ef02ad65
A couple more easy unit tests
2013-03-02 10:56:57 -05:00
Nick Mathewson
55ce9bff54
Remove unused check_fingerprint_syntax
2013-03-01 22:01:26 -05:00
Nick Mathewson
a05dc378e3
Remove unused HMAC-SHA1 function
...
(We're not adding any new SHA1 instances in our protocols, so this
should never actually be needed.)
2013-03-01 21:59:12 -05:00
Nick Mathewson
289653c392
Remove a few more unused functions.
2013-03-01 21:57:52 -05:00
Nick Mathewson
a6c7630845
Unit tests for a few more functions and cases in address.c
...
This brings address's coverage up over 80%.
2013-03-01 14:48:33 -05:00
Nick Mathewson
6dfa709030
Remove the unused addr_mask_cmp_bits
2013-03-01 14:46:34 -05:00
Nick Mathewson
24fb926726
Remove the unused parse_addr_and_port_range
2013-03-01 14:35:17 -05:00
Nick Mathewson
f6697d5b3b
More unit tests for old TAP onion handshake.
...
The test coverage for onion_tap.c is now at 89%, up from 67%.
2013-03-01 14:06:09 -05:00
Nick Mathewson
045c989d03
Merge remote-tracking branch 'origin/maint-0.2.4'
2013-03-01 10:19:19 -05:00
Andrea Shepard
74c33945e3
Correctly set entry->is_dir_cache when adding an entry guard for the first time
...
(Second part of a bug8367 fix. -NM)
2013-03-01 10:17:07 -05:00
Nick Mathewson
ad49abe5a1
Fix bootstrapping with bridges by making is_dir_cache is set on them.
...
This fixes bug 8367, introduced in d7089ff228
2013-03-01 10:17:07 -05:00
Nick Mathewson
dc4ccfdbe2
Merge branch 'bug8367_v2'
2013-03-01 09:33:15 -05:00
Andrea Shepard
8b26766a66
Correctly set entry->is_dir_cache when adding an entry guard for the first time
...
(Second part of a bug8367 fix. -NM)
2013-03-01 09:32:37 -05:00
Nick Mathewson
c0b1f05fe7
Fix bootstrapping with bridges by making is_dir_cache is set on them.
...
This fixes bug 8367, introduced in d7089ff228
2013-03-01 09:32:17 -05:00
Nick Mathewson
c72d58cbff
Merge remote-tracking branch 'public/feature8109'
2013-03-01 00:33:37 -05:00
Nick Mathewson
94d0f226e6
Whoops. I forgot the "alpha"
2013-03-01 00:16:46 -05:00
Nick Mathewson
d9293ab3a7
Bump version in master to 0.2.5.0-alpha-dev
2013-03-01 00:13:36 -05:00
Roger Dingledine
9bc05c30d7
update the in-progress bandwidth requirements for authorities
2013-02-25 09:19:04 -05:00
Nick Mathewson
6879910334
Fix a comment in tor_main.c
...
We don't use subversion or src/*/makefile.am any longer
2013-02-25 03:24:53 -05:00
Nick Mathewson
337e32f5b8
fix a wide line
2013-02-19 15:08:54 -05:00
Nick Mathewson
8ddf4e218e
Merge branch 'bug8065_v2'
2013-02-19 15:02:22 -05:00
Nick Mathewson
3340d3279d
Downgrade an assert to LD_BUG
...
This should prevent crashes on further recurrence of 8065, and help
diagnose such if they occur
2013-02-19 15:02:08 -05:00
Nick Mathewson
804be10b09
Fix a may-be-used-uninitialized warning.
2013-02-19 15:00:08 -05:00
Nick Mathewson
b0b0d6af63
Merge branch 'bug2286_unit_test_squashed'
2013-02-19 14:54:05 -05:00
Andrea Shepard
699c39dada
Test alternate values of maxunmeasuredbw too
2013-02-19 14:53:31 -05:00
Andrea Shepard
f445aae2e3
Update unmeasured bandwidth clipping unit test per NickM's bugfix for the Unmeasured=1 issue
2013-02-19 11:06:24 -05:00
Nick Mathewson
6170bc5a93
Refactor storing of measured_bw versus Unmeasured=1.
...
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.
2013-02-19 11:06:24 -05:00
