Nick Mathewson
411c622906
Merge commit 'bb9b4c37f8e7f5cf78918f382e90d8b11ff42551' into maint-0.2.4
2014-05-07 23:11:32 -04:00
Nick Mathewson
2d83770237
Merge remote-tracking branch 'origin/maint-0.2.4'
2014-05-07 23:07:03 -04:00
Nick Mathewson
0ad8133a7e
Merge remote-tracking branch 'public/ticket11528_024' into maint-0.2.4
2014-05-07 23:04:59 -04:00
Nick Mathewson
882893c8c3
Merge remote-tracking branch 'public/bug11513_024' into maint-0.2.4
2014-05-07 23:04:48 -04:00
Nick Mathewson
894c8b2266
Merge remote-tracking branch 'public/update_ciphers_ff28' into maint-0.2.4
2014-05-07 23:04:22 -04:00
Nick Mathewson
683b80bf81
Merge remote-tracking branch 'public/bug11737_diagnostic'
2014-05-07 22:52:44 -04:00
Nick Mathewson
c948bdaa28
Improve bug11743 message a bit.
2014-05-07 22:23:19 -04:00
Nick Mathewson
0de2625675
Merge remote-tracking branch 'public/bug8387_diagnostic'
2014-05-07 22:15:24 -04:00
Nick Mathewson
48b9c6fcc6
Better log message for 8387 diagnostic
2014-05-07 22:13:29 -04:00
Nick Mathewson
6d39c8d156
Always finalize a zlib stream of server descriptors.
...
Possible fix for bug 11648.
2014-05-07 10:23:08 -04:00
Nick Mathewson
2e1ac274ab
Script to detect unused autoconf outputs
...
Should help speed up mingw builds by a percent or two.
2014-05-07 03:56:51 -04:00
Nick Mathewson
8a2e66b623
Fix test_pick_circid on 32-bit platforms
2014-05-07 03:27:49 -04:00
Nick Mathewson
499e77663e
Basic tests for get_unique_circ_id_by_chan.
2014-05-07 02:57:50 -04:00
Nick Mathewson
e198faa633
Quick-and-dirty test for packed_cell_is_destroy
2014-05-07 02:05:35 -04:00
Nick Mathewson
de3bbc4f53
Move code-generation scripts to scripts/codegen
...
Now that we have a scripts/* directory, let's put the scripts we use
for generating C there.
2014-05-07 01:17:41 -04:00
Nick Mathewson
81144b2bd2
README file for the scripts directory
2014-05-07 01:10:28 -04:00
Nick Mathewson
73bc779038
Add a README file for the contrib directory
2014-05-07 01:03:35 -04:00
Nick Mathewson
a1cdc619bb
Mention siphash in src/ext/README
2014-05-07 01:03:14 -04:00
Nick Mathewson
1adc98b9b5
Split portfw-error-logging code into a new function.
...
No code has changed; only moved. Part of a fix for 9781.
2014-05-06 21:22:40 -04:00
Nick Mathewson
ba5069b310
Remove a spurious variable.
2014-05-06 20:46:26 -04:00
Nick Mathewson
4a740451ac
Merge remote-tracking branch 'public/bug11750'
2014-05-06 20:44:41 -04:00
Nick Mathewson
5cea500ce7
Merge branch 'bug11743_option_b'
2014-05-06 20:40:40 -04:00
Nick Mathewson
52416f8cfb
Unit test for dirvote_create_microdescriptor
2014-05-06 20:36:19 -04:00
Nick Mathewson
ed0e2ecaa7
Unit test for write_to_buf_zlib
2014-05-06 19:29:56 -04:00
Nick Mathewson
2fa601c797
Future-proof "id" lines against proposal 220.
2014-05-06 17:10:59 -04:00
Nick Mathewson
f077bb55ab
fix a copy-paste comment mistake
2014-05-06 17:09:16 -04:00
Nick Mathewson
ea570fa13c
changes file for bug11743
2014-05-06 16:28:34 -04:00
Nick Mathewson
c7549cb4cd
Merge remote-tracking branch 'karsten/bug11742'
2014-05-06 13:54:37 -04:00
Nick Mathewson
a06044a485
Check HT_REP_IS_BAD_() when giving a bug-7164 warning.
...
This may let us know if we're hitting 7164 because of an
hte_hash-corruption situation proposed by "cypherpunks" in bug
11737.
2014-05-06 13:03:24 -04:00
Nick Mathewson
e9c1c3ff7f
Add a siphash benchmark.
2014-05-06 12:55:39 -04:00
Nick Mathewson
0ad607d604
Faster chan_circid_entry_hash implementation
...
Since this is critical-path, let's tune the value we pass to
csiphash a little so it fits into one whole round.
2014-05-06 12:27:18 -04:00
Nick Mathewson
78301d99fe
Fix compilation with DEBUG_DNS_CACHE
...
Reported by cypherpunks.
Fix for #11761 ; bugfix on 0.2.3.13-alpha where we made ht.h stop using
_identifiers.
2014-05-06 10:18:34 -04:00
Nick Mathewson
8127f4db30
Use siphash on channel/circuit-id map too
...
Fixes ticket 11750.
2014-05-05 12:13:58 -04:00
Nick Mathewson
388478561d
Fix cross-compiling when 128-bit math compiles but won't link
...
Apparently, there exist cross-compiling environments for arm7 where
you can compile a 64x64->128 multiply, but not link it.
Fixes bug 11729; bugfix on 0.2.4.8-alpha. Patch from 'conradev'.
2014-05-05 11:44:02 -04:00
Nick Mathewson
4a621a50f5
Consensus method 18: Add a base64 ID digest to the microdesc
...
This is a stopgap measure to make sure that microdescriptors never
collide; see bug 11743.
2014-05-05 11:31:24 -04:00
Nick Mathewson
5d496963b4
Don't start sandbox except for CMD_RUN_TOR
...
This was crashing on --verify-config in the debian startup script, if you
had sandboxing enabled. Fixes 11609; fix on 0.2.5.1-alpha.
2014-05-05 10:29:35 -04:00
Karsten Loesing
1289474dbd
Remove /tor/dbg-stability.txt URL.
...
The /tor/dbg-stability.txt URL was meant to help debug WFU and MTBF
calculations, but nobody was using it.
Fixes #11742 .
2014-05-05 11:21:35 +02:00
Nick Mathewson
8a173635bc
Tweak the changelog formatter a little.
...
(I had a bad clone of Knuth's algorithm sitting around in an old code
repository of mine. I added orphan detection and smarter hyphenation;
it seems to give marginally better results than we had before.)
2014-05-02 12:50:23 -04:00
Nick Mathewson
29b7397ebe
Fix test_config_write_to_data_subdir
...
Bugfix on aa0eb2022342798fc78b2bde89d393f37c59fe78; bugfix not on any
released Tor.
2014-05-01 13:27:20 -04:00
Nick Mathewson
df03e9b737
have only one code path for #9635 logging
2014-05-01 12:40:33 -04:00
Nick Mathewson
7ad0cd209c
Merge remote-tracking branch 'public/bug9635'
2014-05-01 12:39:39 -04:00
Nick Mathewson
c472ac4fb8
Merge remote-tracking branch 'public/bug11233_diagnose'
2014-05-01 12:37:16 -04:00
Nick Mathewson
a2b59dba71
Merge branch 'bug11654_squashed'
2014-05-01 12:34:59 -04:00
George Kadianakis
a787575b7f
Fix a misuse of strlcpy() introduced by the #11156 patch.
2014-05-01 12:34:50 -04:00
Nick Mathewson
0e20825bf2
whitespace fix
2014-05-01 12:31:38 -04:00
Nick Mathewson
b51ce90777
Merge remote-tracking branch 'public/valgrind_tests'
2014-05-01 12:29:31 -04:00
Nick Mathewson
b6c8a14bf3
Merge remote-tracking branch 'public/bug4345a_024'
2014-05-01 12:13:07 -04:00
Nick Mathewson
1bbd3811c1
Merge remote-tracking branch 'public/bug10849_025'
...
Conflicts:
src/or/config.c
2014-05-01 11:51:22 -04:00
Nick Mathewson
9da17ad410
Merge remote-tracking branch 'origin/maint-0.2.4'
...
(this is an "ours" merge, to avoid taking 6a4f5d9b4d
into 0.2.5: that
commit downgrades the bug 7164 warning in versions <= 0.2.4 because it
isn't as useful as the one 0.2.5 has)
2014-05-01 11:45:38 -04:00
Nick Mathewson
14bc6e8993
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
...
Conflicts:
src/or/microdesc.c
2014-05-01 11:44:25 -04:00