55118d90ca
Fix some implicit conversion warnings
2015-04-23 09:09:20 -04:00
196499da73
Use a custom Base64 encoder with more control over the output format.
2015-04-23 09:06:58 -04:00
ba2485f7df
Remove USE_OPENSSL_BASE64 and the associated code.
...
The alternative has been available since 2007, there's no way to
actually enable the ifdef, and it breaks on well formed but not OpenSSL
style inputs.
2015-04-10 09:12:47 +00:00
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
c759ed2c62
update url in HACKING file
2015-04-08 13:44:56 -04:00
202bbfbaa4
Merge branch 'bug15604_squashed'
2015-04-07 15:15:54 -04:00
fda2aa7703
Set ConnDirectionStatistics back to 0 if not running as relay.
2015-04-07 15:15:28 -04:00
edde1a7844
Merge branch 'bug15541_squashed'
2015-04-07 14:09:55 -04:00
6b0c443dde
Update other entries in CMDLINE_ONLY_OPTIONS to use values from takes_argument_t.
2015-04-07 14:09:41 -04:00
e89c200c47
Print the error message for --dump-config even if no arguments are given.
2015-04-07 14:09:41 -04:00
1457364c49
Merge branch 'doc15550_squashed'
2015-04-07 14:05:52 -04:00
636495257b
Improve descriptions of statistics-related torrc options.
2015-04-07 14:04:03 -04:00
f0fa0d2b7b
Add lukas to doc/HACKING pakager list
2015-04-07 07:40:46 -04:00
ad54c197a9
Fix error message in do_dump_config().
2015-04-06 21:01:43 +03:00
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
65cd681635
Merge remote-tracking branch 'origin/maint-0.2.6'
2015-04-06 10:03:51 -04:00
f620b8f032
bump version to 0.2.6.7-dev
2015-04-06 10:02:59 -04:00
e98b8bc495
Forward-port today's changelogs and release notes
2015-04-06 10:01:44 -04:00
eb41214dba
bump version to 0.2.6.7
2015-04-06 10:00:30 -04:00
eab67b06cf
Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6
2015-04-06 09:59:06 -04:00
3a5d4d666e
bump 0.2.5 version to 0.2.5.12
2015-04-06 09:56:37 -04:00
5633261f2e
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
2015-04-06 09:55:44 -04:00
542100d3ca
Bump 0.2.4 version more places
2015-04-06 09:48:53 -04:00
442d577af5
Bump 0.2.4 version
2015-04-06 09:41:59 -04:00
a201a5396e
Merge remote-tracking branch 'origin/maint-0.2.6'
2015-04-06 09:26:28 -04:00
0475552140
Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6
2015-04-06 09:26:16 -04:00
fe69a7e1d7
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
2015-04-06 09:25:37 -04:00
7451b4cafe
Changes file for bug15601
2015-04-06 09:24:16 -04:00
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
7b5f558da4
Treat empty introduction points sections as missing.
...
Found by DonnchaC.
2015-04-06 09:20:46 -04:00
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
24352d0d70
Merge remote-tracking branch 'origin/maint-0.2.6'
2015-04-03 09:47:57 -04:00
929a8f199b
Decrease the amount of rend circ relaunches for hidden services.
2015-04-03 09:47:40 -04:00
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
c2462621ab
Merge commit 'c1b36488e9c318fc414220e8549624b423560ad2'
2015-04-03 09:40:16 -04:00
c1b36488e9
Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6
2015-04-03 09:39:19 -04:00
3781955f07
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
2015-04-03 09:38:54 -04:00
01e4bc80cd
Merge branch 'bug15515_024' into maint-0.2.4
2015-04-03 09:36:59 -04:00
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
8dba8a088d
Block multiple introductions on the same intro circuit.
2015-04-03 09:35:47 -04:00
38c8e0bfc5
Fix the windows test failure caused by the #15435 changes.
2015-04-02 03:25:51 +00:00
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
86002a83d3
Bridges are always dirs
...
This check was accidentally deleted in 05f7336624
2015-04-01 21:07:46 +02:00
081b0c0f77
mark dirinfo_type as unused in populate_live_entry_guards
2015-04-01 14:20:01 -04:00
05fbbfe472
Merge remote-tracking branch 'public/remove_old_version_checks'
2015-04-01 14:02:02 -04:00
d366c3354f
Merge branch 'remove_digests'
2015-04-01 13:53:03 -04:00
cd8f13b5cb
Merge branch 'bug13736'
2015-04-01 13:46:50 -04:00
ad3c2f1c92
Remove now-needless AC_PATH_PROG checks from configure.ac
2015-04-01 13:44:35 -04:00
840c11b14e
Remove dynamicdhgroups from the manpage
2015-04-01 13:41:15 -04:00
baf24bf4d1
Unindent a block in crypto_set_tls_dh_prime
2015-04-01 13:40:37 -04:00
Nick Mathewson
Yawning Angel
Roger Dingledine
rl1987
George Kadianakis
Sebastian Hahn