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
Nick Mathewson
6a4f5d9b4d
Downgrade bug 7164 warning to INFO
...
The 0.2.5.x warning is the one that might help us track this down; the
warnings in stable are just annoying users over and over and over.
2014-05-01 11:42:02 -04:00
Nick Mathewson
01e2aae12a
Changes file for bug 11623 (fix was in 91ff10f6be
)
2014-05-01 11:33:17 -04:00
Nick Mathewson
630b4af260
Merge remote-tracking branch 'andrea/bug11476'
2014-05-01 11:30:55 -04:00
Nick Mathewson
9511522bd4
Merge remote-tracking branch 'origin/maint-0.2.4'
2014-04-30 20:26:55 -04:00
Nick Mathewson
efab3484e6
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
2014-04-30 20:25:15 -04:00
Nick Mathewson
8828794dc2
Merge remote-tracking branch 'public/bug10849_023_bruteforce' into maint-0.2.3
2014-04-30 20:23:22 -04:00
Nick Mathewson
f43fee8f8f
Merge remote-tracking branch 'public/bug11628'
2014-04-30 17:21:15 -04:00
Nick Mathewson
14efaa0283
More .gitignore tweaks; goodbye latex; hello trs
...
We don't have any more latex files in Tor, so there's no reason to
.gitignore all of the latex droppings. On the other hand, automake
likes to use .trs files and .log for test suite outputs.
2014-04-30 13:19:19 -04:00
Nick Mathewson
87e16087b7
Update .gitignore for doc, contrib changes
...
In doc, restoring torify made us generate some .in files we didn't
before.
In contrib, we added tor.service.in, but didn't add tor.service to .gitignore
2014-04-30 10:58:18 -04:00
Nick Mathewson
27438ef7c6
Merge remote-tracking branch 'origin/maint-0.2.4'
...
Doing an "ours" merge to avoid taking 35699ef9f5
, which is
a cherry-picked backport of 9686.
2014-04-29 21:08:26 -04:00
Nick Mathewson
35699ef9f5
Drop the MaxMemInCellQueues lower limit down to 256 MB.
...
on #9686 , gmorehose reports that the 500 MB lower limit is too high
for raspberry pi users.
This is a backport of 647248729f
to 0.2.4.
Note that in 0.2.4, the option is called MaxMemInCellQueues.
2014-04-29 20:48:22 -04:00
Nick Mathewson
545e2119f2
Merge remote-tracking branch 'public/bug11605_024'
2014-04-29 14:33:39 -04:00
Nick Mathewson
b0e078d5af
Log info on ancient one-hop circuits in heartbeat
...
This is an attempt to diagnose 8387.
2014-04-29 14:02:12 -04:00
Nick Mathewson
acc7623420
changes file for last patch
2014-04-29 13:23:54 -04:00
dana koch
88679aa53f
Quench gcc's complaints about discarding constness in TO_ORIGIN_CIRCUIT.
...
This was previously satisfied by using a temporary variable, but there
are three other instances in circuitlist.c that gcc is now bothered by,
so now introduce a CONST_TO_ORIGIN_CIRCUIT that takes a const
circuit_t instead.
2014-04-29 13:18:12 -04:00
Nick Mathewson
cae6388053
Put tor.service in the right place, and autoconfify it
...
This closes 8368.
2014-04-29 13:17:30 -04:00
Jamie Nguyen
a42e81eea1
Add contrib/tor.service for use with systemd
2014-04-29 13:17:29 -04:00
Nick Mathewson
0514bcd37c
Merge remote-tracking branch 'origin/maint-0.2.4'
2014-04-29 13:03:27 -04:00
Nick Mathewson
1d3ffc0ec9
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
2014-04-29 13:02:18 -04:00
Nick Mathewson
65575b0755
Stop leaking memory in error cases of md parsing
...
When clearing a list of tokens, it's important to do token_clear()
on them first, or else any keys they contain will leak. This didn't
leak memory on any of the successful microdescriptor parsing paths,
but it does leak on some failing paths when the failure happens
during tokenization.
Fixes bug 11618; bugfix on 0.2.2.6-alpha.
2014-04-29 13:00:00 -04:00