Nick Mathewson
383238b2f6
forward-port changelog from 0.2.5.7-rc
2014-09-11 21:25:03 -04:00
Nick Mathewson
89e32c7c08
One more whitespace fix
2014-09-11 14:40:24 -04:00
Nick Mathewson
32f75c870e
Whitespace cleanups in test_util
2014-09-11 14:37:12 -04:00
Nick Mathewson
6d66e9068b
Whitespace cleanups in transports/test_pt
2014-09-11 14:36:51 -04:00
Nick Mathewson
b16254dce9
Update HACKING instructions to mention format_changelog script
2014-09-11 11:34:57 -04:00
Nick Mathewson
43a47ae726
Use tor_malloc_zero() in pt tests
...
Fixes for PT tests merged with 8402; patch from Yawning.
2014-09-11 09:17:13 -04:00
Nick Mathewson
2914d56ea4
Merge remote-tracking branch 'origin/maint-0.2.5'
2014-09-11 08:59:24 -04:00
Nick Mathewson
121f4a9ca4
Merge remote-tracking branch 'public/bug13104_025'
2014-09-11 08:30:41 -04:00
Nick Mathewson
d02937a203
Fix "comparison is always false" warnings in new test_util_di_ops
...
Having a constant zero means that unsigned < 0 is always false.
2014-09-11 08:28:46 -04:00
Roger Dingledine
6215ebb266
Reduce log severity for unused ClientTransportPlugin lines
...
Tor Browser includes several ClientTransportPlugin lines in its
torrc-defaults file, leading every Tor Browser user who looks at her
logs to see these notices and wonder if they're dangerous.
Resolves bug 13124; bugfix on 0.2.5.3-alpha.
2014-09-11 08:02:37 -04:00
Nick Mathewson
48558ed1aa
Merge remote-tracking branch 'public/bug13104_025'
2014-09-11 00:11:26 -04:00
Nick Mathewson
2491eadf00
C90 compliance for #13104 fixes
2014-09-11 00:10:53 -04:00
Nick Mathewson
9e595a95a8
Add a changes file for bug 13104
2014-09-11 00:05:56 -04:00
Nick Mathewson
284cc9a224
Avoid an overflow on negation in format_helper_exit_status
...
Part of 13104; patch from teor.
2014-09-11 00:00:13 -04:00
Nick Mathewson
59f9a5c786
Avoid divide by zero and NaNs in scale_array_elements_to_u64
...
Patch from teor; part of 13104
2014-09-10 23:59:21 -04:00
Nick Mathewson
5126bc2ebd
Extra tests for tor_memeq and memcmp
...
(Patch from teor; part of 13104)
2014-09-10 23:58:02 -04:00
Nick Mathewson
d2463c0cfe
Avoid overflows and underflows in sscanf and friends
...
(Patch from teor on 13104)
2014-09-10 23:57:31 -04:00
Nick Mathewson
73ee161d8a
Merge remote-tracking branch 'origin/maint-0.2.5'
2014-09-10 23:48:59 -04:00
Nick Mathewson
3c2c6a6116
In routerlist_assert_ok(), check r2 before taking &(r2->cache_info)
...
Technically, we're not allowed to take the address of a member can't
exist relative to the null pointer. That makes me wonder how any sane
compliant system implements the offsetof macro, but let's let sleeping
balrogs lie.
Fixes 13096; patch on 0.1.1.9-alpha; patch from "teor", who was using
clang -fsanitize=undefined-trap -fsanitize-undefined-trap-on-error -ftrapv
2014-09-10 23:48:11 -04:00
Nick Mathewson
e07206afea
Merge remote-tracking branch 'yawning/bug_8402'
2014-09-10 23:41:55 -04:00
Nick Mathewson
5474d8ae05
Merge remote-tracking branch 'public/torrc_minimal'
2014-09-10 23:36:27 -04:00
Nick Mathewson
93dfb12037
Remember log messages that happen before logs are configured
...
(And replay them once we know our first real logs.)
This is an implementation for issue 6938. It solves the problem of
early log mesages not getting sent to log files, but not the issue of
early log messages not getting sent to controllers.
2014-09-10 23:34:43 -04:00
Nick Mathewson
6e2ef4bc5e
Refactor the 'deliver a log message' logic to its own function.
2014-09-10 22:58:36 -04:00
Nick Mathewson
de114587f0
Turn log loop into a for loop, and "Does this lf want this" into a fn
2014-09-10 22:39:55 -04:00
Nick Mathewson
15a318b49a
Refactor pending_cb_message_t into a type with proper functions
...
Also, rename it.
2014-09-10 22:35:16 -04:00
Nick Mathewson
a9b2e5eac6
Merge remote-tracking branch 'public/bug12908_025' into maint-0.2.5
2014-09-10 22:12:47 -04:00
Nick Mathewson
916d53d6ce
Mark StrictE{ntry,xit}Nodes as obsolete.
2014-09-10 07:10:10 -04:00
Yawning Angel
cae44838fe
Fix issues brought up in nickm's review.
...
* Update pt_get_proxy_uri() documentation.
* proxy_supported is now unsigned.
* Added a changes file.
2014-09-09 18:21:19 +00:00
George Kadianakis
01800ea1e4
Add unittests for finding the third quartile of a set.
2014-09-09 12:28:15 -04:00
Nick Mathewson
8e39395199
Merge remote-tracking branch 'asn/bug13064'
2014-09-09 12:26:16 -04:00
Nick Mathewson
40b7dfaed2
Remove now-pointless SIZE_MAX stanza from OpenBSD_malloc_linux
2014-09-09 12:09:18 -04:00
Nick Mathewson
1eea7a68ed
Use S?SIZE_MAX, not S?SIZE_T_MAX
...
This fixes bug 13102 (not on any released Tor) where using the
standard SSIZE_MAX name broke mingw64, and we didn't realize.
I did this with
perl -i -pe 's/SIZE_T_MAX/SIZE_MAX/' src/*/*.[ch] src/*/*/*.[ch]
2014-09-09 12:08:03 -04:00
Sebastian Hahn
409a56281e
Remove client-side bad directory logic
...
Implements the second half of #13060 .
2014-09-09 11:54:20 -04:00
Sebastian Hahn
8099dee992
Remove dirauth support for the BadDirectory flag
...
Implements the first half of #13060 . The second half will be to remove
client support, too.
2014-09-09 11:54:15 -04:00
Nick Mathewson
59f3cce0dc
Merge branch 'bug12899_squashed'
2014-09-09 11:51:18 -04:00
Sebastian Hahn
607724c696
Remove support for naming directory authorities
...
This implements the meat of #12899 . This commit should simply remove the
parts of Tor dirauths used to check whether a relay was supposed to be
named or not, it doesn't yet convert to a new mechanism for
reject/invalid/baddir/badexiting relays.
2014-09-09 11:50:21 -04:00
Nick Mathewson
4af88d68b4
Merge remote-tracking branch 'origin/maint-0.2.5'
2014-09-09 11:05:28 -04:00
Nick Mathewson
8eed82b3d4
Merge remote-tracking branch 'andrea/bug12160_025' into maint-0.2.5
2014-09-09 11:04:54 -04:00
Nick Mathewson
619bd43a5e
Merge remote-tracking branch 'origin/maint-0.2.5'
2014-09-09 10:57:09 -04:00
Nick Mathewson
dd22ab519a
Merge remote-tracking branch 'public/bug12700_024' into maint-0.2.5
2014-09-09 10:51:39 -04:00
Nick Mathewson
a9d24f3304
Updated building-tor-msvc.txt
2014-09-09 10:33:45 -04:00
Nick Mathewson
4e98ec8149
Add instructions for building Tor with MSVC.
...
Written by "NewEraCracker" on ticket 13081; I've added a note that
this is not our preferred or supported build method.
2014-09-09 10:30:57 -04:00
Nick Mathewson
2997908228
Merge remote-tracking branch 'origin/maint-0.2.5'
2014-09-09 10:27:41 -04:00
Nick Mathewson
8391c96091
Clean up the MVSC nmake files so they work again.
...
Fixes bug 13081; bugfix on 0.2.5.1-alpha. Patch from "NewEraCracker."
2014-09-09 10:27:05 -04:00
Nick Mathewson
ad0ae89b3c
Merge remote-tracking branch 'origin/maint-0.2.5'
2014-09-09 10:22:42 -04:00
Nick Mathewson
a3c49ca79a
Add more escaped() calls in directory.c
...
Patch from teor to fix 13071.
2014-09-09 10:22:01 -04:00
Nick Mathewson
2ecaa59bd7
Merge remote-tracking branch 'origin/maint-0.2.5'
2014-09-08 15:16:45 -04:00
Nick Mathewson
d229025fef
Expand the event_mask field in controller conns to 64 bits
...
Back in 078d6bcd
, we added an event number 0x20, but we didn't make
the event_mask field big enough to compensate.
Patch by "teor". Fixes 13085; bugfix on 0.2.5.1-alpha.
2014-09-08 15:16:02 -04:00
Nick Mathewson
781b477bc8
Merge remote-tracking branch 'origin/maint-0.2.5'
2014-09-08 15:08:51 -04:00
Nick Mathewson
f551a053e3
Add cscope generated files to .gitignore.
...
Closes #13092 ; patch from dgoulet.
2014-09-08 15:07:54 -04:00