]> git.ipfire.org Git - thirdparty/tor.git/log
thirdparty/tor.git
12 years agoTests for backtrace.c
Nick Mathewson [Tue, 30 Jul 2013 01:56:31 +0000 (21:56 -0400)] 
Tests for backtrace.c

These need to be a separate executable, since the point of backtrace.c
is that it can crash and write stuff.

12 years agoUnit tests for new functions in log.c
Nick Mathewson [Mon, 29 Jul 2013 17:30:49 +0000 (13:30 -0400)] 
Unit tests for new functions in log.c

12 years agoMake backtrace handler handle signals correctly.
Nick Mathewson [Fri, 26 Jul 2013 11:22:56 +0000 (13:22 +0200)] 
Make backtrace handler handle signals correctly.

This meant moving a fair bit of code around, and writing a signal
cleanup function.  Still pretty nice from what I can tell, though.

12 years agoUse pc_from_ucontext.m4 from Google Performance Tools
Nick Mathewson [Fri, 26 Jul 2013 10:46:17 +0000 (12:46 +0200)] 
Use pc_from_ucontext.m4 from Google Performance Tools

This M4 module lets us learn the right way (out of at least 18
possibilities) to extract the current PC for stack-trace-fixup-in-signal
purposes.  The Google Performance Tools license is 3-clause BSD.

12 years agoImprove new assertion message logging
Nick Mathewson [Thu, 25 Jul 2013 10:12:35 +0000 (12:12 +0200)] 
Improve new assertion message logging

Don't report that a failure happened in the assertion_failed function just
because we logged it from there.

12 years agoAdd a sighandler-safe logging mechanism
Nick Mathewson [Sat, 20 Jul 2013 02:47:49 +0000 (22:47 -0400)] 
Add a sighandler-safe logging mechanism

We had accidentially grown two fake ones: one for backtrace.c, and one
for sandbox.c.  Let's do this properly instead.

Now, when we configure logs, we keep track of fds that should get told
about bad stuff happening from signal handlers.  There's another entry
point for these that avoids using non-signal-handler-safe functions.

12 years agoOn Linux (and some other systems) we need -rdynamic for backtraces
Nick Mathewson [Fri, 19 Jul 2013 18:18:43 +0000 (14:18 -0400)] 
On Linux (and some other systems) we need -rdynamic for backtraces

12 years agoBasic backtrace ability
Nick Mathewson [Fri, 19 Jul 2013 18:09:58 +0000 (14:09 -0400)] 
Basic backtrace ability

On platforms with the backtrace/backtrace_symbols_fd interface, Tor
can now dump stack traces on assertion failure.  By default, I log
them to DataDir/stack_dump and to stderr.

12 years agoRefactor the assertion-failure code into a function
Nick Mathewson [Fri, 19 Jul 2013 17:40:20 +0000 (13:40 -0400)] 
Refactor the assertion-failure code into a function

12 years agoAdd a signal-safe decimal formatting function
Nick Mathewson [Fri, 19 Jul 2013 17:03:23 +0000 (13:03 -0400)] 
Add a signal-safe decimal formatting function

12 years agoWhoops; check in test_circuitmux.c
Nick Mathewson [Fri, 19 Jul 2013 16:05:38 +0000 (12:05 -0400)] 
Whoops; check in test_circuitmux.c

12 years agoMerge branch 'bug9296'
Nick Mathewson [Fri, 19 Jul 2013 15:58:20 +0000 (11:58 -0400)] 
Merge branch 'bug9296'

12 years agoRegression test for destroy cell queue
Nick Mathewson [Fri, 19 Jul 2013 14:17:00 +0000 (10:17 -0400)] 
Regression test for destroy cell queue

This exercises the code that crashed and caused #9296.

12 years agoInitialize destroy_cell_queue.
Nick Mathewson [Fri, 19 Jul 2013 13:49:35 +0000 (09:49 -0400)] 
Initialize destroy_cell_queue.

Likely fix for the crash bug of #9296, which was introduced through a
combination of #7912 and #8586.  Bugfix not in any released Tor.

12 years agoMerge remote-tracking branch 'origin/maint-0.2.4'
Nick Mathewson [Fri, 19 Jul 2013 03:17:57 +0000 (23:17 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.4'

12 years agoMerge remote-tracking branch 'public/bug9295_023' into maint-0.2.4
Nick Mathewson [Fri, 19 Jul 2013 03:17:05 +0000 (23:17 -0400)] 
Merge remote-tracking branch 'public/bug9295_023' into maint-0.2.4

12 years agoFix for bug 9295: Don't crash when running --hash-password.
Nick Mathewson [Fri, 19 Jul 2013 03:15:46 +0000 (23:15 -0400)] 
Fix for bug 9295: Don't crash when running --hash-password.

Fix on 0.2.4.15-rc; I'm doing this branch against 0.2.3, since we're
considering #9122 for an 0.2.3 backport, and if we do, we should merge
this too.

12 years agotmp
Nick Mathewson [Fri, 19 Jul 2013 03:08:36 +0000 (23:08 -0400)] 
tmp

12 years agoStart of a unit test for options_validate.
Nick Mathewson [Thu, 18 Jul 2013 18:38:31 +0000 (14:38 -0400)] 
Start of a unit test for options_validate.

I added this so I could write a unit test for ServerTransportOptions,
but it incidentally exercises the succeed-on-defaults case of
options_validate too.

12 years agoMerge branch 'simpleq_for_cells_3'
Nick Mathewson [Thu, 18 Jul 2013 15:24:57 +0000 (11:24 -0400)] 
Merge branch 'simpleq_for_cells_3'

12 years agoAdd a test for n_cells_in_circuit_queues
Nick Mathewson [Thu, 18 Jul 2013 15:21:27 +0000 (11:21 -0400)] 
Add a test for n_cells_in_circuit_queues

12 years agoUnit tests for cell queues.
Nick Mathewson [Thu, 18 Jul 2013 15:02:36 +0000 (11:02 -0400)] 
Unit tests for cell queues.

This removes some INLINE markers from functions that probably didn't
need them.

12 years agoUse TOR_SIMPLEQ for packed_cell_t
Nick Mathewson [Fri, 22 Mar 2013 18:25:34 +0000 (14:25 -0400)] 
Use TOR_SIMPLEQ for packed_cell_t

12 years agoRemove a redundant declaration
Nick Mathewson [Thu, 18 Jul 2013 12:56:02 +0000 (08:56 -0400)] 
Remove a redundant declaration

12 years agoRemove a stray debugging echo from configure.ac
Nick Mathewson [Thu, 18 Jul 2013 12:54:28 +0000 (08:54 -0400)] 
Remove a stray debugging echo from configure.ac

12 years agoFix a wide line in test_pt.c
Nick Mathewson [Thu, 18 Jul 2013 12:49:52 +0000 (08:49 -0400)] 
Fix a wide line in test_pt.c

12 years agoMerge branch 'bug8978_rebase_2'
Nick Mathewson [Thu, 18 Jul 2013 12:48:20 +0000 (08:48 -0400)] 
Merge branch 'bug8978_rebase_2'

Conflicts:
src/test/test_pt.c

12 years agoMerge branch 'bug8929_rebase_2'
Nick Mathewson [Thu, 18 Jul 2013 12:45:13 +0000 (08:45 -0400)] 
Merge branch 'bug8929_rebase_2'

12 years agoImprove test coverage of 8929 code
Nick Mathewson [Mon, 15 Jul 2013 21:32:08 +0000 (17:32 -0400)] 
Improve test coverage of 8929 code

12 years agoFix memory leaks in test_config_parse_transport_options_line
Nick Mathewson [Mon, 15 Jul 2013 17:26:47 +0000 (13:26 -0400)] 
Fix memory leaks in test_config_parse_transport_options_line

12 years agoDocument what "escape" means in tor_escape_str_for_pt_args
Nick Mathewson [Mon, 15 Jul 2013 17:17:25 +0000 (13:17 -0400)] 
Document what "escape" means in tor_escape_str_for_pt_args

12 years agoInsert the environment variable only if we have options to pass.
George Kadianakis [Thu, 13 Jun 2013 09:18:07 +0000 (12:18 +0300)] 
Insert the environment variable only if we have options to pass.

12 years agoAdd changes file and enrich the manual page.
George Kadianakis [Wed, 12 Jun 2013 16:01:22 +0000 (19:01 +0300)] 
Add changes file and enrich the manual page.

12 years agoPlace the options in the environment after processing them properly.
George Kadianakis [Wed, 12 Jun 2013 14:12:39 +0000 (17:12 +0300)] 
Place the options in the environment after processing them properly.

12 years agoRename tor_escape_str_for_socks_arg() to something more generic.
George Kadianakis [Wed, 12 Jun 2013 13:36:13 +0000 (16:36 +0300)] 
Rename tor_escape_str_for_socks_arg() to something more generic.

Since we are going to be using that function to also escape parameters
passed to transport proxies using environment variables.

12 years agoPass characters to be escaped to tor_escape_str_for_socks_arg().
George Kadianakis [Wed, 12 Jun 2013 13:23:16 +0000 (16:23 +0300)] 
Pass characters to be escaped to tor_escape_str_for_socks_arg().

This is in preparation for using tor_escape_str_for_socks_arg() to
escape server-side pluggable transport parameters.

12 years agoWrite unit tests for the ServerTransportOptions parsing function.
George Kadianakis [Wed, 12 Jun 2013 12:28:48 +0000 (15:28 +0300)] 
Write unit tests for the ServerTransportOptions parsing function.

12 years agoWrite function that parses ServerTransportOptions torrc lines.
George Kadianakis [Wed, 12 Jun 2013 12:28:31 +0000 (15:28 +0300)] 
Write function that parses ServerTransportOptions torrc lines.

And use it to validate them.

12 years agoAdd a basic unit test for pt_get_extra_info_descriptor_string.
Nick Mathewson [Tue, 16 Jul 2013 15:53:36 +0000 (11:53 -0400)] 
Add a basic unit test for pt_get_extra_info_descriptor_string.

12 years agoAdd a unit test for smethod lines with arguments.
Nick Mathewson [Tue, 16 Jul 2013 15:53:25 +0000 (11:53 -0400)] 
Add a unit test for smethod lines with arguments.

12 years agoWrite transport ARGS to extra-info descriptor.
George Kadianakis [Tue, 2 Jul 2013 16:33:55 +0000 (19:33 +0300)] 
Write transport ARGS to extra-info descriptor.

12 years agoExtract ARGS from SMETHOD line and attach them to transport.
George Kadianakis [Mon, 1 Jul 2013 13:45:21 +0000 (16:45 +0300)] 
Extract ARGS from SMETHOD line and attach them to transport.

12 years agoA python script to combin gcov output with git blame
Nick Mathewson [Tue, 16 Jul 2013 19:31:07 +0000 (15:31 -0400)] 
A python script to combin gcov output with git blame

12 years agoMerge remote-tracking branch 'origin/maint-0.2.4'
Nick Mathewson [Tue, 16 Jul 2013 18:49:41 +0000 (14:49 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.4'

12 years agoRe-do a cast in order to make old buggy freebsd gcc happy
Nick Mathewson [Tue, 16 Jul 2013 18:48:12 +0000 (14:48 -0400)] 
Re-do a cast in order to make old buggy freebsd gcc happy

Fix for #9254.  Bugfix on 0.2.4.14-alpha.

This is not actually a bug in the Tor code.

12 years agoMerge remote-tracking branch 'asn/bug9265'
Nick Mathewson [Tue, 16 Jul 2013 13:55:51 +0000 (09:55 -0400)] 
Merge remote-tracking branch 'asn/bug9265'

12 years agoRemove an unused variable in test_replaycache_scrub
Nick Mathewson [Tue, 16 Jul 2013 13:53:44 +0000 (09:53 -0400)] 
Remove an unused variable in test_replaycache_scrub

12 years agoMake contrib/coverage smarter about check file-existence edge cases
Andrea Shepard [Tue, 16 Jul 2013 13:40:08 +0000 (06:40 -0700)] 
Make contrib/coverage smarter about check file-existence edge cases

12 years agoAdd more replaycache.c unit tests, bringing coverage to 100% for that file
Andrea Shepard [Tue, 16 Jul 2013 13:02:22 +0000 (06:02 -0700)] 
Add more replaycache.c unit tests, bringing coverage to 100% for that file

12 years agoEliminate an impossible case in replaycache_scrub_if_needed_internal()
Andrea Shepard [Tue, 16 Jul 2013 13:01:50 +0000 (06:01 -0700)] 
Eliminate an impossible case in replaycache_scrub_if_needed_internal()

12 years agoTest deeper in test_pt_parsing().
George Kadianakis [Tue, 16 Jul 2013 11:07:03 +0000 (14:07 +0300)] 
Test deeper in test_pt_parsing().

We used to test parse_{c,s}method_line() without actually testing that
the resulting transport_t was well formed.

12 years agoAdd optional target directory parameter to coverage script and add reset-gcov target...
Andrea Shepard [Tue, 16 Jul 2013 05:33:39 +0000 (22:33 -0700)] 
Add optional target directory parameter to coverage script and add reset-gcov target to Makefile.am

12 years agoAppease "make check-spaces"
Nick Mathewson [Mon, 15 Jul 2013 21:35:56 +0000 (17:35 -0400)] 
Appease "make check-spaces"

12 years agoUse format_hex_number_sigsafe to format syscalls in sandbox.c
Nick Mathewson [Mon, 15 Jul 2013 17:07:09 +0000 (13:07 -0400)] 
Use format_hex_number_sigsafe to format syscalls in sandbox.c

This way, we don't have to use snprintf, which is not guaranteed to
be signal-safe.

(Technically speaking, strlen() and strlcpy() are not guaranteed to
be signal-safe by the POSIX standard. But I claim that they are on
every platform that supports libseccomp2, which is what matters
here.)

12 years agoLightly refactor and test format_hex_number_sigsafe
Nick Mathewson [Mon, 15 Jul 2013 16:52:29 +0000 (12:52 -0400)] 
Lightly refactor and test format_hex_number_sigsafe

Better tests for upper bounds, and for failing cases.

Also, change the function's interface to take a buffer length rather
than a maximum length, and then NUL-terminate: functions that don't
NUL-terminate are trouble waiting to happen.

12 years agoHEX_ERRNO_SIZE is no longer the correct upper limit for format_hex_number_sigsafe
Nick Mathewson [Mon, 15 Jul 2013 16:39:47 +0000 (12:39 -0400)] 
HEX_ERRNO_SIZE is no longer the correct upper limit for format_hex_number_sigsafe

12 years agoExpose format_hex_number_..., and rename it to ..._sigsafe().
Nick Mathewson [Mon, 15 Jul 2013 16:26:55 +0000 (12:26 -0400)] 
Expose format_hex_number_..., and rename it to ..._sigsafe().

There are some other places in the code that will want a signal-safe
way to format numbers, so it shouldn't be static to util.c.

12 years agoDon't build format_helper_exit_status on win32
Nick Mathewson [Mon, 15 Jul 2013 16:17:23 +0000 (12:17 -0400)] 
Don't build format_helper_exit_status on win32

The only thing that used format_helper_exit_status on win32 was the
unit tests. This caused an error when we tried to leave a static
format_helper_exit_status lying around in a production object file.

The easiest solution is to admit that this way of dealing with process
exit status is Unix-only.

12 years agoMerge remote-tracking branch 'linus/unused_param'
Nick Mathewson [Mon, 15 Jul 2013 16:02:46 +0000 (12:02 -0400)] 
Merge remote-tracking branch 'linus/unused_param'

12 years agoMerge remote-tracking branch 'linus/binshify'
Nick Mathewson [Mon, 15 Jul 2013 16:02:40 +0000 (12:02 -0400)] 
Merge remote-tracking branch 'linus/binshify'

12 years agoMerge remote-tracking branch 'public/fancy_test_tricks'
Nick Mathewson [Mon, 15 Jul 2013 16:02:18 +0000 (12:02 -0400)] 
Merge remote-tracking branch 'public/fancy_test_tricks'

Conflicts:
src/common/include.am

Conflict was from adding testsupport.h near where sandbox.h had
already been added.

12 years agoTraditional /bin/sh is unhappy about {a,b} globbing.
Linus Nordberg [Mon, 15 Jul 2013 14:06:39 +0000 (16:06 +0200)] 
Traditional /bin/sh is unhappy about {a,b} globbing.

12 years agoAvoid compiler warning 'unused param'.
Linus Nordberg [Mon, 15 Jul 2013 13:46:36 +0000 (15:46 +0200)] 
Avoid compiler warning 'unused param'.

Fixes #9261.

12 years agoFix two pre-coffee typos
Peter Palfrader [Mon, 15 Jul 2013 13:08:35 +0000 (15:08 +0200)] 
Fix two pre-coffee typos

12 years agoAnd a changes file for #9258
Peter Palfrader [Mon, 15 Jul 2013 08:55:11 +0000 (10:55 +0200)] 
And a changes file for #9258

12 years agoReject relative control socket paths and emit a warning.
Peter Palfrader [Mon, 15 Jul 2013 08:46:22 +0000 (10:46 +0200)] 
Reject relative control socket paths and emit a warning.

Previously we would accept relative paths, but only if they contained a
slash somewhere (not at the end).

Otherwise we would silently not work.  Closes: #9258.  Bugfix on
0.2.3.16-alpha.

12 years agoDocument get_parent_directory more
Peter Palfrader [Mon, 15 Jul 2013 08:46:11 +0000 (10:46 +0200)] 
Document get_parent_directory more

12 years agocosmetic cleanups
Roger Dingledine [Sun, 14 Jul 2013 06:49:34 +0000 (02:49 -0400)] 
cosmetic cleanups

12 years agoput sandbox.h in the tarball, so the tarball builds
Roger Dingledine [Sun, 14 Jul 2013 00:31:18 +0000 (20:31 -0400)] 
put sandbox.h in the tarball, so the tarball builds

12 years agoMerge remote-tracking branch 'public/gsoc-ctoader-cap-phase1-squashed'
Nick Mathewson [Fri, 12 Jul 2013 21:12:43 +0000 (17:12 -0400)] 
Merge remote-tracking branch 'public/gsoc-ctoader-cap-phase1-squashed'

12 years agoRemove a bogus semicolon spotted by Gisle Vanem
Nick Mathewson [Thu, 11 Jul 2013 19:53:35 +0000 (15:53 -0400)] 
Remove a bogus semicolon spotted by Gisle Vanem

12 years agoAdd a basic seccomp2 syscall filter on Linux
Cristian Toader [Mon, 17 Jun 2013 10:07:14 +0000 (13:07 +0300)] 
Add a basic seccomp2 syscall filter on Linux

It's controlled by the new Sandbox argument.  Right now, it's rather
coarse-grained, it's Linux-only, and it may break some features.

12 years agoAdd some basic unit tests for the circuit map data structure.
Nick Mathewson [Wed, 10 Jul 2013 19:07:32 +0000 (15:07 -0400)] 
Add some basic unit tests for the circuit map data structure.

These show off the new mocking code by mocking the circuitmux code
so that we can test the circuit map code in isolation.

12 years agoAdd rudimentary test mocking support.
Nick Mathewson [Wed, 10 Jul 2013 19:03:01 +0000 (15:03 -0400)] 
Add rudimentary test mocking support.

This is not the most beautiful possible implementation (it requires
decorating mockable functions with ugly macros), but it actually
works, and is portable across multiple compilers and architectures.

12 years agoAdd a script to compare directories full of gcov output
Nick Mathewson [Tue, 9 Jul 2013 16:54:39 +0000 (12:54 -0400)] 
Add a script to compare directories full of gcov output

We can't just use "diff", since we don't care about changes in line
numbers, or changes in the exact number of times a line was called.
We just care about changes that make lines covered or non-coverd.  So
pre-process the files before calling diff.

12 years agoCoverage support: build with --enable-coverage to have tests run with gcov
Nick Mathewson [Tue, 9 Jul 2013 16:37:11 +0000 (12:37 -0400)] 
Coverage support: build with --enable-coverage to have tests run with gcov

If you pass the --enable-coverage flag on the command line, we build
our testing binaries with appropriate options eo enable coverage
testing.  We also build a "tor-cov" binary that has coverage enabled,
for integration tests.

On recent OSX versions, test coverage only works with clang, not gcc.
So we warn about that.

Also add a contrib/coverage script to actually run gcov with the
appropriate options to generate useful .gcov files.  (Thanks to
automake, the .o files will not have the names that gcov expects to
find.)

Also, remove generated gcda and gcno files on clean.

12 years agoCompletely refactor how FILENAME_PRIVATE works
Nick Mathewson [Thu, 6 Jun 2013 21:58:28 +0000 (17:58 -0400)] 
Completely refactor how FILENAME_PRIVATE works

We previously used FILENAME_PRIVATE identifiers mostly for
identifiers exposed only to the unit tests... but also for
identifiers exposed to the benchmarker, and sometimes for
identifiers exposed to a similar module, and occasionally for no
really good reason at all.

Now, we use FILENAME_PRIVATE identifiers for identifiers shared by
Tor and the unit tests.  They should be defined static when we
aren't building the unit test, and globally visible otherwise. (The
STATIC macro will keep us honest here.)

For identifiers used only by the unit tests and never by Tor at all,
on the other hand, we wrap them in #ifdef TOR_UNIT_TESTS.

This is not the motivating use case for the split test/non-test
build system; it's just a test example to see how it works, and to
take a chance to clean up the code a little.

12 years agoStart work on fancy compiler tricks to expose extra stuff to our tests
Nick Mathewson [Thu, 6 Jun 2013 18:56:05 +0000 (14:56 -0400)] 
Start work on fancy compiler tricks to expose extra stuff to our tests

This is mainly a matter of automake trickery: we build each static
library in two versions now: one with the TOR_UNIT_TESTS macro
defined, and one without.  When TOR_UNIT_TESTS is defined, we can
enable mocking and expose more functions. When it's not defined, we
can lock the binary down more.

The alternatives would be to have alternate build modes: a "testing
configuration" for building the libraries with test support, and a
"production configuration" for building them without.  I don't favor
that approach, since I think it would mean more people runnning
binaries build for testing, or more people not running unit tests.

12 years agoMerge remote-tracking branch 'origin/maint-0.2.4'
Nick Mathewson [Mon, 8 Jul 2013 15:35:48 +0000 (11:35 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.4'

12 years agoMerge branch 'bug9200' into maint-0.2.4
Nick Mathewson [Mon, 8 Jul 2013 15:35:25 +0000 (11:35 -0400)] 
Merge branch 'bug9200' into maint-0.2.4

12 years agoAdd a comment and a check for why flag indices will be <= 63
Nick Mathewson [Mon, 8 Jul 2013 15:35:06 +0000 (11:35 -0400)] 
Add a comment and a check for why flag indices will be <= 63

12 years agoMerge remote-tracking branch 'karsten/geoip-manual-update-jul2013'
Nick Mathewson [Mon, 8 Jul 2013 13:23:39 +0000 (09:23 -0400)] 
Merge remote-tracking branch 'karsten/geoip-manual-update-jul2013'

12 years agoMerge remote-tracking branch 'origin/maint-0.2.4'
Nick Mathewson [Mon, 8 Jul 2013 13:23:09 +0000 (09:23 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.4'

12 years agoMerge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
Nick Mathewson [Mon, 8 Jul 2013 13:22:49 +0000 (09:22 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4

12 years agoMerge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3
Nick Mathewson [Mon, 8 Jul 2013 13:22:00 +0000 (09:22 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3

12 years agoUpdate to the July 2013 GeoIP database.
Karsten Loesing [Mon, 8 Jul 2013 08:21:28 +0000 (10:21 +0200)] 
Update to the July 2013 GeoIP database.

12 years agoAdd 2 new manual A1 substitutions.
Karsten Loesing [Mon, 8 Jul 2013 08:14:42 +0000 (10:14 +0200)] 
Add 2 new manual A1 substitutions.

12 years agoFIx undefined behavior in dirvote.c
Nick Mathewson [Wed, 3 Jul 2013 16:01:37 +0000 (12:01 -0400)] 
FIx undefined behavior in dirvote.c

 Fix a bug in the voting algorithm that could yield incorrect results
 when a non-naming authority declared too many flags. Fixes bug 9200;
 bugfix on 0.2.0.3-alpha.

Found by coverity scan.

12 years agoMerge remote-tracking branch 'linus/bug8530'
Nick Mathewson [Sat, 29 Jun 2013 20:02:13 +0000 (16:02 -0400)] 
Merge remote-tracking branch 'linus/bug8530'

12 years agoMerge remote-tracking branch 'origin/maint-0.2.4'
Nick Mathewson [Sat, 29 Jun 2013 07:51:53 +0000 (03:51 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.4'

12 years agoMerge branch 'bug9147' into maint-0.2.4
Nick Mathewson [Sat, 29 Jun 2013 07:50:37 +0000 (03:50 -0400)] 
Merge branch 'bug9147' into maint-0.2.4

12 years agoGive a warning when bufferevents are enabled.
Nick Mathewson [Sat, 29 Jun 2013 07:45:40 +0000 (03:45 -0400)] 
Give a warning when bufferevents are enabled.

Ticket 9147.

12 years agoMerge remote-tracking branch 'origin/maint-0.2.4'
Nick Mathewson [Mon, 24 Jun 2013 16:55:29 +0000 (12:55 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.4'

12 years agoFix bug 9122: don't allow newdefaultoptions to be NULL
Nick Mathewson [Mon, 24 Jun 2013 13:56:25 +0000 (09:56 -0400)] 
Fix bug 9122: don't allow newdefaultoptions to be NULL

(This caused a crash that was reported as bug 9122, but the underlying
behavior has been wrong for a while.)

Fix on 0.2.3.9-alpha.

12 years agoFix #5584 - raise awareness of safer logging - warn about potentially unsafe config...
Marek Majkowski [Thu, 13 Jun 2013 16:29:14 +0000 (17:29 +0100)] 
Fix #5584 - raise awareness of safer logging - warn about potentially unsafe config options

12 years agoForward-port the 0.2.4.14-alpha changelog
Nick Mathewson [Tue, 18 Jun 2013 20:25:56 +0000 (16:25 -0400)] 
Forward-port the 0.2.4.14-alpha changelog

12 years agoMerge remote-tracking branch 'origin/maint-0.2.4'
Nick Mathewson [Tue, 18 Jun 2013 18:47:15 +0000 (14:47 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.4'

12 years agoMerge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
Nick Mathewson [Tue, 18 Jun 2013 18:45:29 +0000 (14:45 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4

12 years agoCheck more return values in the unit tests
Nick Mathewson [Tue, 18 Jun 2013 16:31:03 +0000 (12:31 -0400)] 
Check more return values in the unit tests

12 years agoFix some problems with the bug9002 fix.
Nick Mathewson [Tue, 18 Jun 2013 15:54:57 +0000 (11:54 -0400)] 
Fix some problems with the bug9002 fix.

Fixes bug 9090; bug not in any released Tor.