]> git.ipfire.org Git - thirdparty/tor.git/log
thirdparty/tor.git
10 years agoImprove log messages for diagnosing 13762
Nick Mathewson [Wed, 18 Feb 2015 18:05:15 +0000 (13:05 -0500)] 
Improve log messages for diagnosing 13762

10 years agoMerge remote-tracking branch 'yawning/cid1270894'
Nick Mathewson [Wed, 18 Feb 2015 17:13:54 +0000 (12:13 -0500)] 
Merge remote-tracking branch 'yawning/cid1270894'

10 years agoActually free measured_guardfraction.
Yawning Angel [Wed, 18 Feb 2015 16:36:57 +0000 (16:36 +0000)] 
Actually free measured_guardfraction.

CID 1270894

10 years agowhitespace fixes
Nick Mathewson [Wed, 18 Feb 2015 15:55:56 +0000 (10:55 -0500)] 
whitespace fixes

10 years agoFix an implicit-narrowing warning
Nick Mathewson [Wed, 18 Feb 2015 14:34:15 +0000 (09:34 -0500)] 
Fix an implicit-narrowing warning

10 years agoMerge remote-tracking branch 'yawning/bug14918'
Nick Mathewson [Wed, 18 Feb 2015 14:21:16 +0000 (09:21 -0500)] 
Merge remote-tracking branch 'yawning/bug14918'

10 years agoCombine test_helpers.[ch] and testhelper.[ch]
Nick Mathewson [Wed, 18 Feb 2015 14:19:38 +0000 (09:19 -0500)] 
Combine test_helpers.[ch] and testhelper.[ch]

10 years agoMerge branch 'bug9321_rerebase'
Nick Mathewson [Wed, 18 Feb 2015 14:17:02 +0000 (09:17 -0500)] 
Merge branch 'bug9321_rerebase'

Conflicts:
src/or/dirvote.h
src/test/include.am
src/test/test_entrynodes.c

10 years agoDon't exit if we can't find the GuardfractionFile when booting.
George Kadianakis [Fri, 6 Feb 2015 12:20:24 +0000 (12:20 +0000)] 
Don't exit if we can't find the GuardfractionFile when booting.

...just disable the feature in that case.

10 years agoFinal guardfraction preparations for upstream merge.
George Kadianakis [Thu, 29 Jan 2015 15:49:23 +0000 (15:49 +0000)] 
Final guardfraction preparations for upstream merge.

- Write a changes file.
- Change some logs to lesser severities.

10 years agoAdd unittests for the guardfraction feature.
George Kadianakis [Thu, 29 Jan 2015 15:10:28 +0000 (15:10 +0000)] 
Add unittests for the guardfraction feature.

10 years agoUnittest prep: Move get_yesterday_date_str() to helper file.
George Kadianakis [Thu, 29 Jan 2015 15:09:53 +0000 (15:09 +0000)] 
Unittest prep: Move get_yesterday_date_str() to helper file.

We want to use this function in our guardfraction unittests, so make a
test_helpers module and move it there.

10 years agoCalculate relay weighted bandwidth using guardfraction bandwidths.
George Kadianakis [Thu, 29 Jan 2015 15:07:35 +0000 (15:07 +0000)] 
Calculate relay weighted bandwidth using guardfraction bandwidths.

Now use the guardfraction function to calculate individual relay
bandwidth weights.

10 years agoCalculate total bandwidth weights using the guardfraction bandwidths.
George Kadianakis [Thu, 29 Jan 2015 15:06:33 +0000 (15:06 +0000)] 
Calculate total bandwidth weights using the guardfraction bandwidths.

Now use the function introduced in the previous commit, to calculate the
total bandwidth weights when making the consensus.

10 years agoCalculate the guardfraction bandwidth of a guard.
George Kadianakis [Thu, 29 Jan 2015 15:05:30 +0000 (15:05 +0000)] 
Calculate the guardfraction bandwidth of a guard.

10 years agoParse GuardFraction info from consensuses and votes.
George Kadianakis [Thu, 29 Jan 2015 14:57:00 +0000 (14:57 +0000)] 
Parse GuardFraction info from consensuses and votes.

Also introduce the UseGuardFraction torrc option which decides whether
clients should use guardfraction information found in the consensus.

10 years agoWrite GuardFraction information to consensus.
George Kadianakis [Thu, 29 Jan 2015 14:59:48 +0000 (14:59 +0000)] 
Write GuardFraction information to consensus.

If we've seen enough votes with guardfraction information, write down
the GuardFraction string in the consensus.

10 years agoWrite guardfraction information to votes.
George Kadianakis [Thu, 29 Jan 2015 14:55:35 +0000 (14:55 +0000)] 
Write guardfraction information to votes.

If a dirauth has guardfraction information about a guard, write it down
when serializing the routerstatus.

10 years agoParse Guardfraction file and apply results to routerstatuses.
George Kadianakis [Thu, 29 Jan 2015 14:54:47 +0000 (14:54 +0000)] 
Parse Guardfraction file and apply results to routerstatuses.

Parse the file just before voting and apply its information to the
provided vote_routerstatus_t. This follows the same logic as when
dirauths parse bwauth files.

10 years agoFix bootstrap directory information logging.
Yawning Angel [Wed, 18 Feb 2015 13:58:13 +0000 (13:58 +0000)] 
Fix bootstrap directory information logging.

`dir_info_status` is used from main.c:directory_info_has_arrived() to
provide useful (INFO/NOTICE) level logging to users, and should always
be updated regardless of the rate limiting.

10 years agoAdd description to the precious Python variable.
cypherpunks [Fri, 13 Feb 2015 12:57:07 +0000 (13:57 +0100)] 
Add description to the precious Python variable.

10 years agoFix compute_frac_paths_available, when ExitNodes is not set.
Yawning Angel [Wed, 18 Feb 2015 12:51:07 +0000 (12:51 +0000)] 
Fix compute_frac_paths_available, when ExitNodes is not set.

10 years agoMerge branch 'bug14918'
Nick Mathewson [Tue, 17 Feb 2015 17:49:29 +0000 (12:49 -0500)] 
Merge branch 'bug14918'

10 years agoMerge remote-tracking branch 'public/feature_13822'
Nick Mathewson [Tue, 17 Feb 2015 17:34:13 +0000 (12:34 -0500)] 
Merge remote-tracking branch 'public/feature_13822'

10 years agoFix some issues with reporting exit-free networks
Nick Mathewson [Tue, 17 Feb 2015 17:07:24 +0000 (12:07 -0500)] 
Fix some issues with reporting exit-free networks

Fixes bug 14918.

10 years agoReflow 0.2.6.3 changelog.
Nick Mathewson [Tue, 17 Feb 2015 15:20:32 +0000 (10:20 -0500)] 
Reflow 0.2.6.3 changelog.

10 years agoFold new entries into 0.2.6.3 changelog
Nick Mathewson [Tue, 17 Feb 2015 15:17:46 +0000 (10:17 -0500)] 
Fold new entries into 0.2.6.3 changelog

10 years agoFix warnings from lintChanges.py
Nick Mathewson [Tue, 17 Feb 2015 15:10:43 +0000 (10:10 -0500)] 
Fix warnings from lintChanges.py

10 years agoCheck thread count for negative; realloc->reallocarray
Nick Mathewson [Tue, 17 Feb 2015 13:46:11 +0000 (08:46 -0500)] 
Check thread count for negative; realloc->reallocarray

CID 1268069

10 years agoHave tinytest tolerate systems where char has > 8 bytes
Nick Mathewson [Tue, 17 Feb 2015 13:40:55 +0000 (08:40 -0500)] 
Have tinytest tolerate systems where char has > 8 bytes

CID 1064418

10 years agoUse --list-fingerprint instead of process control in zero_length_keys.sh
Nick Mathewson [Tue, 17 Feb 2015 13:30:32 +0000 (08:30 -0500)] 
Use --list-fingerprint instead of process control in zero_length_keys.sh

Using kill and wait in this way may have been making windows
builders unhappy.

10 years agoWrap two long lines
Nick Mathewson [Tue, 17 Feb 2015 13:30:28 +0000 (08:30 -0500)] 
Wrap two long lines

10 years agotrivial whitespace fix
Roger Dingledine [Tue, 17 Feb 2015 11:01:33 +0000 (06:01 -0500)] 
trivial whitespace fix

10 years agoMaybe this will make coverity not care that this check is dead. CID 1268063
Nick Mathewson [Mon, 16 Feb 2015 20:44:18 +0000 (15:44 -0500)] 
Maybe this will make coverity not care that this check is dead. CID 1268063

10 years agoNo, coverity, this is not a memory leak. 1268065
Nick Mathewson [Mon, 16 Feb 2015 20:42:48 +0000 (15:42 -0500)] 
No, coverity, this is not a memory leak.  1268065

10 years agoFix a few coverity "Use after NULL check" warnings
Nick Mathewson [Mon, 16 Feb 2015 20:40:15 +0000 (15:40 -0500)] 
Fix a few coverity "Use after NULL check" warnings

Also remove the unit test mocks that allowed get_options() to be
NULL; that's an invariant violation for get_options().

10 years agoFix deadcode warning in get_interface_addresses_raw().
Nick Mathewson [Mon, 16 Feb 2015 20:28:33 +0000 (15:28 -0500)] 
Fix deadcode warning in get_interface_addresses_raw().

CID  1268070

10 years agoFix a trivial double-close in address.c. CID 1268071
Nick Mathewson [Mon, 16 Feb 2015 20:24:13 +0000 (15:24 -0500)] 
Fix a trivial double-close in address.c. CID 1268071

10 years agoCall cpu_init if we change to being a relay
Sebastian Hahn [Sun, 15 Feb 2015 10:49:19 +0000 (11:49 +0100)] 
Call cpu_init if we change to being a relay

The issue is that we use the cpuworker system with relays only, so if we
start up as a client and transition to being a relay later, we'll be
sad.

This fixes bug 14901; not in any released version of Tor.

10 years agoDon't leak a cond var when starting threads in a pool
Sebastian Hahn [Sun, 15 Feb 2015 10:21:54 +0000 (11:21 +0100)] 
Don't leak a cond var when starting threads in a pool

10 years agoMerge remote-tracking branch 'sebastian/bug14875'
Nick Mathewson [Thu, 12 Feb 2015 19:50:13 +0000 (14:50 -0500)] 
Merge remote-tracking branch 'sebastian/bug14875'

10 years agoAvoid undefined behaviour in ifreq_to_smartlist
Sebastian Hahn [Thu, 12 Feb 2015 13:56:47 +0000 (14:56 +0100)] 
Avoid undefined behaviour in ifreq_to_smartlist

This could trigger where _SIZEOF_ADDR_IFREQ() might not return a
multiple of sizeof(void *). Fixes bug 14875; not in any released version
of Tor.

10 years agoActually get all interface addresses
Sebastian Hahn [Thu, 12 Feb 2015 12:59:31 +0000 (13:59 +0100)] 
Actually get all interface addresses

If we guessed a buffer size too small, we never increased the buffer and
tried again

Also simplify the interface of ifreq_to_smartlist a little

10 years agoMerge branch 'bug14478_squashed'
Nick Mathewson [Wed, 11 Feb 2015 20:59:41 +0000 (15:59 -0500)] 
Merge branch 'bug14478_squashed'

10 years agoPut error messages to stderr
Sebastian Hahn [Wed, 11 Feb 2015 20:43:41 +0000 (21:43 +0100)] 
Put error messages to stderr

Thanks weasel :)

Also remove stray debug output

10 years agoChange exit code of zero_length_keys script
Sebastian Hahn [Wed, 11 Feb 2015 20:40:49 +0000 (21:40 +0100)] 
Change exit code of zero_length_keys script

Weasel notes that exit codes above 128 are for when a script dies from a
signal.

10 years agoAvoid undefined behaviour of test
Sebastian Hahn [Sat, 7 Feb 2015 13:54:21 +0000 (14:54 +0100)] 
Avoid undefined behaviour of test

Fixes part of bug #14478, patch idea suggested by an anonymous
contributor. Thanks!

10 years agoCheck that mktemp result is a directory
Sebastian Hahn [Sat, 7 Feb 2015 13:48:06 +0000 (14:48 +0100)] 
Check that mktemp result is a directory

Fixes part of bug #14478, patch idea suggested by an anonymous
contributor. Thanks!

10 years agoClean up after zero length key test
Sebastian Hahn [Fri, 6 Feb 2015 22:21:20 +0000 (23:21 +0100)] 
Clean up after zero length key test

10 years agoMerge remote-tracking branch 'public/bug14759'
Nick Mathewson [Wed, 11 Feb 2015 20:15:24 +0000 (15:15 -0500)] 
Merge remote-tracking branch 'public/bug14759'

10 years agofix a compilation warning
Nick Mathewson [Wed, 11 Feb 2015 20:10:35 +0000 (15:10 -0500)] 
fix a compilation warning

10 years agoMerge remote-tracking branch 'public/remove_freelist'
Nick Mathewson [Wed, 11 Feb 2015 20:09:01 +0000 (15:09 -0500)] 
Merge remote-tracking branch 'public/remove_freelist'

10 years agoMerge branch 'bug12844'
Nick Mathewson [Wed, 11 Feb 2015 20:06:04 +0000 (15:06 -0500)] 
Merge branch 'bug12844'

Conflicts:
src/or/circuituse.c
src/test/include.am
src/test/test_entrynodes.c

10 years agoAdditional paranoia: do not even build tor2web stuff if not using.
Nick Mathewson [Wed, 11 Feb 2015 19:54:16 +0000 (14:54 -0500)] 
Additional paranoia: do not even build tor2web stuff if not using.

(That is, don't build it unless we're building for tor2web, or we
are building for tests.)

10 years agoFix crash on glibc __libc_message()
Nick Mathewson [Wed, 11 Feb 2015 14:44:07 +0000 (09:44 -0500)] 
Fix crash on glibc __libc_message()

__libc_message() tries to open /dev/tty with O_RDWR, but the sandbox
catches that and calls it a crash.  Instead, I'm making the sandbox
setenv LIBC_FATAL_STDERR_, so that glibc uses stderr instead.

Fix for 14759, bugfix on 0.2.5.1-alpha

10 years agoRemove mempools and buf freelists
Nick Mathewson [Wed, 11 Feb 2015 14:03:50 +0000 (09:03 -0500)] 
Remove mempools and buf freelists

They have been off-by-default since 0.2.5 and nobody has complained. :)

Also remove the buf_shrink() function, which hasn't done anything
since we first stopped using contiguous memory to store buffers.

Closes ticket 14848.

10 years agoMerge remote-tracking branch 'public/feature_13555'
Nick Mathewson [Wed, 11 Feb 2015 13:42:00 +0000 (08:42 -0500)] 
Merge remote-tracking branch 'public/feature_13555'

10 years agoMerge remote-tracking branch 'sebastian/bug14819'
Nick Mathewson [Wed, 11 Feb 2015 13:40:48 +0000 (08:40 -0500)] 
Merge remote-tracking branch 'sebastian/bug14819'

10 years agoMerge remote-tracking branch 'sysrqb/bug14802_025'
Nick Mathewson [Tue, 10 Feb 2015 06:39:55 +0000 (22:39 -0800)] 
Merge remote-tracking branch 'sysrqb/bug14802_025'

10 years agoMerge remote-tracking branch 'teor/avoid-NULL-smartlist-foreach'
Nick Mathewson [Tue, 10 Feb 2015 06:35:40 +0000 (22:35 -0800)] 
Merge remote-tracking branch 'teor/avoid-NULL-smartlist-foreach'

10 years agoAdd some comments to or_circuit_t.workqueue_entry
Sebastian Hahn [Mon, 9 Feb 2015 15:11:45 +0000 (16:11 +0100)] 
Add some comments to or_circuit_t.workqueue_entry

These were suggested by dgoulet, thanks!

10 years agoAvoid use-after-free of circ belonging to cancelled job
Sebastian Hahn [Mon, 9 Feb 2015 15:04:51 +0000 (16:04 +0100)] 
Avoid use-after-free of circ belonging to cancelled job

This fixes a bug where we decide to free the circuit because it isn't on
any workqueue anymore, and then the job finishes and the circuit gets
freed again.

Fixes bug #14815, not in any released version of Tor.

10 years agoRe-remove the --disable-threads configure option
Sebastian Hahn [Mon, 9 Feb 2015 08:09:00 +0000 (09:09 +0100)] 
Re-remove the --disable-threads configure option

10 years agoReserve enough space for rend_service_port_config_t
Sebastian Hahn [Mon, 9 Feb 2015 03:48:16 +0000 (04:48 +0100)] 
Reserve enough space for rend_service_port_config_t

In #14803, Damian noticed that his Tor sometimes segfaults. Roger noted
that his valgrind gave an invalid write of size one here. Whenever we
use FLEXIBLE_ARRAY_MEMBER, we have to make sure to actually malloc a
thing that's large enough.

Fixes bug #14803, not in any released version of Tor.

10 years agoReturn 0 when detecting the amount of memory fails
Matthew Finkel [Mon, 9 Feb 2015 01:58:22 +0000 (01:58 +0000)] 
Return 0 when detecting the amount of memory fails

Fixes bug 14802;  bugfix on 0.2.5.4-alpha.

10 years agoAvoid calling SMARTLIST_FOREACH on a NULL smartlist in tests
teor [Sun, 8 Feb 2015 12:41:37 +0000 (23:41 +1100)] 
Avoid calling SMARTLIST_FOREACH on a NULL smartlist in tests

Check if each smartlist is NULL before calling SMARTLIST_FOREACH on it.

Bug discovered by the clang static analyzer.
Apple clang 600.0.56 (LLVM 3.5svn) on x86_64-apple-darwin14.1.0.

10 years agoSearch-and-replace to regain coding style in wake of 13822.
Nick Mathewson [Sat, 7 Feb 2015 13:32:04 +0000 (08:32 -0500)] 
Search-and-replace to regain coding style in wake of 13822.

(all-caps should be reserved for global or module-global constants and

10 years agoSplit ROUTER_REQUIRED_MIN_BANDWIDTH into RELAY_ and BRIDGE_ variants
Nick Mathewson [Sat, 7 Feb 2015 13:30:40 +0000 (08:30 -0500)] 
Split ROUTER_REQUIRED_MIN_BANDWIDTH into RELAY_ and BRIDGE_ variants

Also raise those minima from 20 to 75 and 50 respectively.

Closes ticket 13822.

10 years agoControl: getinfo entry-guards report down-since
David Goulet [Wed, 28 Jan 2015 15:52:14 +0000 (10:52 -0500)] 
Control: getinfo entry-guards report down-since

If the guard unreachable_since variable was set, the status "up" was
reported which is wrong. This adds the "down" status followed by the
unreachable_since time value.

Fixes #14184

Signed-off-by: David Goulet <dgoulet@ev0ke.net>
10 years agoRemove useless export in zero length key test
Sebastian Hahn [Fri, 6 Feb 2015 20:56:26 +0000 (21:56 +0100)] 
Remove useless export in zero length key test

Fixes part of bug #14478, patch idea suggested by an anonymous
contributor. Thanks!

10 years agoDon't use invalid exit values in zero length key test
Sebastian Hahn [Fri, 6 Feb 2015 20:53:22 +0000 (21:53 +0100)] 
Don't use invalid exit values in zero length key test

Shell exit values must fall into the range of [0-255], so let's honour
this. In practice, the "exit -1" from the old code set an exit value of
255 on most systems, so let's pick that.

Fixes part of bug #14478, patch idea suggested by an anonymous
contributor. Thanks!

10 years agoMerge remote-tracking branch 'sebastian/bug13993'
Nick Mathewson [Fri, 6 Feb 2015 20:42:53 +0000 (15:42 -0500)] 
Merge remote-tracking branch 'sebastian/bug13993'

10 years agoFix check-spaces complaints
Sebastian Hahn [Fri, 6 Feb 2015 20:36:40 +0000 (21:36 +0100)] 
Fix check-spaces complaints

10 years agoAvoid logging startup messages twice
Sebastian Hahn [Fri, 6 Feb 2015 20:17:48 +0000 (21:17 +0100)] 
Avoid logging startup messages twice

10 years agoAdd unit test for #13290
Sebastian Hahn [Fri, 6 Feb 2015 19:39:10 +0000 (20:39 +0100)] 
Add unit test for #13290

10 years agoFix scheduler compilation on targets where char is unsigned.
Yawning Angel [Fri, 6 Feb 2015 16:26:28 +0000 (16:26 +0000)] 
Fix scheduler compilation on targets where char is unsigned.

Per discussion with nickm, the `dir` argument should be a int rather
than a signed char.

Fixes bug #14764.

10 years agochanges file for 13796
Nick Mathewson [Fri, 6 Feb 2015 03:54:34 +0000 (22:54 -0500)] 
changes file for 13796

10 years agoMerge remote-tracking branch 'public/bug13796'
Nick Mathewson [Fri, 6 Feb 2015 03:53:15 +0000 (22:53 -0500)] 
Merge remote-tracking branch 'public/bug13796'

10 years agoRun the format_changelog script for initial cleanup
Nick Mathewson [Thu, 5 Feb 2015 19:03:15 +0000 (14:03 -0500)] 
Run the format_changelog script for initial cleanup

10 years agoStart working on an 0.2.3 changelog
Nick Mathewson [Thu, 5 Feb 2015 19:01:56 +0000 (14:01 -0500)] 
Start working on an 0.2.3 changelog

This is just sorting the entries and lightly editing a couple of
problems I found.

10 years agoFix a work-counting bug introduced by the workqueue merge
Nick Mathewson [Thu, 5 Feb 2015 17:17:08 +0000 (12:17 -0500)] 
Fix a work-counting bug introduced by the workqueue merge

David Goulet finds that when he runs a busy relay for a while with the
latest version of the git code, the number of onionskins handled
slowly dwindles to zero, with total_pending_tasks wedged at its
maximum value.

I conjecture this is because the total_pending_tasks variable isn't
decremented when we successfully cancel a job.  Fixed that.

Fixes bug 14741; bugfix not on any released version of tor.

10 years agouse ARRAY_LENGTH macro in domain_to_string
Nick Mathewson [Thu, 5 Feb 2015 16:01:13 +0000 (11:01 -0500)] 
use ARRAY_LENGTH macro in domain_to_string

10 years agoMerge remote-tracking branch 'yawning/bug14740'
Nick Mathewson [Thu, 5 Feb 2015 15:59:44 +0000 (10:59 -0500)] 
Merge remote-tracking branch 'yawning/bug14740'

10 years agoAdd a string representation for LD_SCHED, and a extra sanity check.
Yawning Angel [Thu, 5 Feb 2015 15:46:27 +0000 (15:46 +0000)] 
Add a string representation for LD_SCHED, and a extra sanity check.

This both fixes the problem, and ensures that forgetting to update
domain_list in the future will trigger the bug codepath instead of
a NULL pointer deref.

10 years agoimprove changes files more
Nick Mathewson [Thu, 5 Feb 2015 15:06:16 +0000 (10:06 -0500)] 
improve changes files more

10 years ago14554 doesn't need a changes file: the bug wasn't in a release
Nick Mathewson [Thu, 5 Feb 2015 15:04:41 +0000 (10:04 -0500)] 
14554 doesn't need a changes file: the bug wasn't in a release

10 years agoBump the minimum relay version to 0.2.4.18-rc
Nick Mathewson [Wed, 4 Feb 2015 18:27:56 +0000 (13:27 -0500)] 
Bump the minimum relay version to 0.2.4.18-rc

Closes #13555

10 years agoUse getsockname, not getsockopt, on TPROXY sockets
Nick Mathewson [Wed, 4 Feb 2015 15:09:54 +0000 (10:09 -0500)] 
Use getsockname, not getsockopt, on TPROXY sockets

10 years agofix a unit tests memory leak (my fault)
Nick Mathewson [Tue, 3 Feb 2015 20:58:48 +0000 (15:58 -0500)] 
fix a unit tests memory leak (my fault)

10 years agoWork around test_status.c weirdness
Nick Mathewson [Tue, 3 Feb 2015 20:50:31 +0000 (15:50 -0500)] 
Work around test_status.c weirdness

Ordinarily, get_options() can never return NULL, but with
test_status.c mocking, it can.  So test for that case.

The best fix here would be to pass the options value to a
bridge_server_mode() function.

10 years agoMerge branch 'bug6852'
Nick Mathewson [Tue, 3 Feb 2015 18:06:58 +0000 (13:06 -0500)] 
Merge branch 'bug6852'

Conflicts:
src/or/status.c

10 years agoChoose a more deliberate cutoff for clients in heartbeat
Nick Mathewson [Tue, 3 Feb 2015 18:02:22 +0000 (13:02 -0500)] 
Choose a more deliberate cutoff for clients in heartbeat

10 years agoMerge remote-tracking branch 'public/bug9635_warnings_025'
Nick Mathewson [Mon, 2 Feb 2015 21:31:32 +0000 (16:31 -0500)] 
Merge remote-tracking branch 'public/bug9635_warnings_025'

Conflicts:
src/test/test.c

10 years agotweak based on comments from dgoulet
Nick Mathewson [Mon, 2 Feb 2015 19:37:02 +0000 (14:37 -0500)] 
tweak based on comments from dgoulet

10 years agoMerge branch 'feature13865_test'
Nick Mathewson [Mon, 2 Feb 2015 19:38:47 +0000 (14:38 -0500)] 
Merge branch 'feature13865_test'

10 years agoTest for 13865.
rl1987 [Mon, 2 Feb 2015 19:11:23 +0000 (21:11 +0200)] 
Test for 13865.

10 years agoAdd more parenthesis to the definition of ARRAY_LENGTH
Nick Mathewson [Mon, 2 Feb 2015 19:14:35 +0000 (14:14 -0500)] 
Add more parenthesis to the definition of ARRAY_LENGTH

10 years agoFix an unused-variable warning.
Nick Mathewson [Mon, 2 Feb 2015 18:35:44 +0000 (13:35 -0500)] 
Fix an unused-variable warning.

10 years agoMerge branch 'feature13864_squashed'
Nick Mathewson [Mon, 2 Feb 2015 18:32:53 +0000 (13:32 -0500)] 
Merge branch 'feature13864_squashed'

10 years agoUpdating manpage for 13865.
rl1987 [Mon, 26 Jan 2015 19:33:19 +0000 (21:33 +0200)] 
Updating manpage for 13865.