Nick Mathewson
b98cc79477
Merge remote-tracking branch 'sebastian/bug14784'
2015-04-15 11:10:37 -04:00
Nick Mathewson
c3e8b7f2da
Fix another space issue
2015-04-15 10:38:12 -04:00
Nick Mathewson
eec58c3548
Merge remote-tracking branch 'teor/fix-spaces-20150415'
2015-04-15 10:37:55 -04:00
Nick Mathewson
8837cc266e
Merge remote-tracking branch 'dgoulet/bug14391_026_v2'
2015-04-15 10:33:04 -04:00
cypherpunks
59e753a4a6
Make --hash-password imply --hush to prevent unnecessary noise.
2015-04-15 09:39:41 -04:00
teor
af2b6bdaba
Fix spaces in crypto.h and test-memwipe.c
2015-04-15 19:42:41 +10:00
Yawning Angel
e891deb021
Disable the udp_socket_trick_blackbox tests that fail due to #12377
...
Till someone writes get_interface_address6 interface enumeration that is
routing table aware, these tests will continue to fail on certain
systems because the get_interface_address6() code is broken.
2015-04-10 18:13:34 +00:00
Nick Mathewson
f9327848ba
Collect badness values in ntor_ref.py; don't just clobber.
...
Fixes bug 15591; patch from joelanders
2015-04-09 11:57:55 -04:00
Nick Mathewson
202bbfbaa4
Merge branch 'bug15604_squashed'
2015-04-07 15:15:54 -04:00
rl1987
fda2aa7703
Set ConnDirectionStatistics back to 0 if not running as relay.
2015-04-07 15:15:28 -04:00
Nick Mathewson
edde1a7844
Merge branch 'bug15541_squashed'
2015-04-07 14:09:55 -04:00
rl1987
6b0c443dde
Update other entries in CMDLINE_ONLY_OPTIONS to use values from takes_argument_t.
2015-04-07 14:09:41 -04:00
rl1987
e89c200c47
Print the error message for --dump-config even if no arguments are given.
2015-04-07 14:09:41 -04:00
rl1987
ad54c197a9
Fix error message in do_dump_config().
2015-04-06 21:01:43 +03:00
Yawning Angel
79544a6fc5
Fix the memory leak in warn_if_option_path_is_relative().
...
Fixes coverity defect CID 1293337, not in any released version of tor.
2015-04-06 17:53:01 +00:00
Nick Mathewson
a201a5396e
Merge remote-tracking branch 'origin/maint-0.2.6'
2015-04-06 09:26:28 -04:00
Nick Mathewson
0475552140
Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6
2015-04-06 09:26:16 -04:00
Nick Mathewson
fe69a7e1d7
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
2015-04-06 09:25:37 -04:00
Yawning Angel
dc3cb00080
Handle empty/zero length encoded intro points more gracefully.
...
In theory these should never the triggered as the only caller now
validates the parameters before this routine gets called.
2015-04-06 09:21:43 -04:00
Yawning Angel
7b5f558da4
Treat empty introduction points sections as missing.
...
Found by DonnchaC.
2015-04-06 09:20:46 -04:00
Yawning Angel
49ddd92c11
Validate the RSA key size received when parsing INTRODUCE2 cells.
...
Fixes bug 15600; reported by skruffy
2015-04-06 09:18:17 -04:00
Nick Mathewson
24352d0d70
Merge remote-tracking branch 'origin/maint-0.2.6'
2015-04-03 09:47:57 -04:00
George Kadianakis
929a8f199b
Decrease the amount of rend circ relaunches for hidden services.
2015-04-03 09:47:40 -04:00
George Kadianakis
8656cbcfc0
... and if we do get multiple INTRODUCE1s on a circuit, kill the circuit
...
(Sending a nak would be pointless.)
See ticket 15515 for discussion.
2015-04-03 09:40:47 -04:00
Nick Mathewson
c1b36488e9
Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6
2015-04-03 09:39:19 -04:00
Nick Mathewson
3781955f07
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
2015-04-03 09:38:54 -04:00
Nick Mathewson
01e4bc80cd
Merge branch 'bug15515_024' into maint-0.2.4
2015-04-03 09:36:59 -04:00
George Kadianakis
bcb839387e
... and if we do get multiple INTRODUCE1s on a circuit, kill the circuit
...
(Sending a nak would be pointless.)
See ticket 15515 for discussion.
2015-04-03 09:36:05 -04:00
George Kadianakis
8dba8a088d
Block multiple introductions on the same intro circuit.
2015-04-03 09:35:47 -04:00
Yawning Angel
38c8e0bfc5
Fix the windows test failure caused by the #15435 changes.
2015-04-02 03:25:51 +00:00
Sebastian Hahn
e10e6f78b1
Update entrynodes unit test for dirs
...
We no longer base our opinion on whether someone is a directory solely
on the routerstatus we might have for that relay, but also on a
routerinfo. Remove logic in test checking that. This broke unit tests in
05f7336624
2015-04-01 21:10:39 +02:00
Sebastian Hahn
86002a83d3
Bridges are always dirs
...
This check was accidentally deleted in 05f7336624
2015-04-01 21:07:46 +02:00
Nick Mathewson
081b0c0f77
mark dirinfo_type as unused in populate_live_entry_guards
2015-04-01 14:20:01 -04:00
Nick Mathewson
05fbbfe472
Merge remote-tracking branch 'public/remove_old_version_checks'
2015-04-01 14:02:02 -04:00
Nick Mathewson
d366c3354f
Merge branch 'remove_digests'
2015-04-01 13:53:03 -04:00
Nick Mathewson
cd8f13b5cb
Merge branch 'bug13736'
2015-04-01 13:46:50 -04:00
Nick Mathewson
baf24bf4d1
Unindent a block in crypto_set_tls_dh_prime
2015-04-01 13:40:37 -04:00
Nick Mathewson
8ba2d971b1
Remove needless call to crypto_set_tls_dh_prime()
2015-04-01 13:37:47 -04:00
Nick Mathewson
aa7b792250
Merge remote-tracking branch 'yawning/feature15435'
2015-04-01 13:34:14 -04:00
Nick Mathewson
34fa4ad637
Merge remote-tracking branch 'public/bug15515_025'
2015-04-01 12:59:19 -04:00
George Kadianakis
a7eae4ddc5
Block multiple introductions on the same intro circuit.
2015-04-01 12:58:52 -04:00
Nick Mathewson
13209eb6f3
Merge remote-tracking branch 'dgoulet/bug15296_027_01'
2015-04-01 12:50:36 -04:00
Nick Mathewson
0ddd8f06a9
Merge remote-tracking branch 'yawning/feature15471'
2015-04-01 12:47:16 -04:00
Nick Mathewson
c66dd17980
Drop support for --digests
...
This is a fair amount of maintainance burden, and doesn't help much
more than the git microversion.
Closes ticket 14742.
2015-04-01 09:54:20 -04:00
Nick Mathewson
1ac3cb4823
work around lack of AF_CCITT
2015-03-31 15:56:52 -04:00
Nick Mathewson
02c3879f87
Merge remote-tracking branch 'teor/ticket15431-event-mask-tests'
2015-03-31 14:57:04 -04:00
Nick Mathewson
725d6157df
fix some compilation warnings
2015-03-31 14:42:01 -04:00
Nick Mathewson
30e933b136
Merge branch 'ticket14710_squashed'
2015-03-31 14:37:09 -04:00
rl1987
33fbb5011d
Use tor_inet_pton() (not inet_pton()) in testcases.
2015-03-31 14:37:02 -04:00
rl1987
5e759127f8
Remove unused function.
2015-03-31 14:37:02 -04:00
