]> git.ipfire.org Git - thirdparty/tor.git/log
thirdparty/tor.git
11 years agoFix numerous 64->32 errors in the unit tests
Nick Mathewson [Thu, 8 May 2014 18:01:17 +0000 (14:01 -0400)] 
Fix numerous 64->32 errors in the unit tests

Before the 11825 fix, these were all silently ignored.

11 years agoFix unearthed problems in unit tests
Nick Mathewson [Thu, 8 May 2014 17:16:08 +0000 (13:16 -0400)] 
Fix unearthed problems in unit tests

11 years agoFix numerous type errors in the unit tests
Nick Mathewson [Thu, 8 May 2014 17:08:13 +0000 (13:08 -0400)] 
Fix numerous type errors in the unit tests

Remove tinytest casts that were suppressing them.

Fix for #11825.

11 years agoFix test_util_max_mem on 32-bit CPUs
Nick Mathewson [Thu, 8 May 2014 16:48:41 +0000 (12:48 -0400)] 
Fix test_util_max_mem on 32-bit CPUs

11 years agoMore unit tests for #11648-related stuff
Nick Mathewson [Thu, 8 May 2014 16:41:01 +0000 (12:41 -0400)] 
More unit tests for #11648-related stuff

These are actually tests for #311.  It appears to me that we didn't
fix #311 properly when we thought we did in 475eb5d6; instead, the
real fix was 05eff35ac6d64b, a few minutes earlier.

11 years agoMove structures into (private) part of buffers.h so we can inspect them while testing
Nick Mathewson [Thu, 8 May 2014 16:40:40 +0000 (12:40 -0400)] 
Move structures into (private) part of buffers.h so we can inspect them while testing

11 years agoMerge remote-tracking branch 'public/bug11648'
Nick Mathewson [Thu, 8 May 2014 16:01:23 +0000 (12:01 -0400)] 
Merge remote-tracking branch 'public/bug11648'

11 years agochanges file for 11648
Nick Mathewson [Thu, 8 May 2014 16:01:12 +0000 (12:01 -0400)] 
changes file for 11648

11 years agoReturn success when get_total_system_memory() succeeds.
Nick Mathewson [Thu, 8 May 2014 04:32:22 +0000 (00:32 -0400)] 
Return success when get_total_system_memory() succeeds.

Fixes bug 11805; bugfix on 0.2.5.4-alpha.

11 years agoMerge remote-tracking branch 'origin/maint-0.2.4'
Nick Mathewson [Thu, 8 May 2014 03:12:51 +0000 (23:12 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.4'

11 years agoMerge commit 'bb9b4c37f8e7f5cf78918f382e90d8b11ff42551' into maint-0.2.4
Nick Mathewson [Thu, 8 May 2014 03:11:32 +0000 (23:11 -0400)] 
Merge commit 'bb9b4c37f8e7f5cf78918f382e90d8b11ff42551' into maint-0.2.4

11 years agoMerge remote-tracking branch 'origin/maint-0.2.4'
Nick Mathewson [Thu, 8 May 2014 03:07:03 +0000 (23:07 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.4'

11 years agoMerge remote-tracking branch 'public/ticket11528_024' into maint-0.2.4
Nick Mathewson [Thu, 8 May 2014 03:04:59 +0000 (23:04 -0400)] 
Merge remote-tracking branch 'public/ticket11528_024' into maint-0.2.4

11 years agoMerge remote-tracking branch 'public/bug11513_024' into maint-0.2.4
Nick Mathewson [Thu, 8 May 2014 03:04:48 +0000 (23:04 -0400)] 
Merge remote-tracking branch 'public/bug11513_024' into maint-0.2.4

11 years agoMerge remote-tracking branch 'public/update_ciphers_ff28' into maint-0.2.4
Nick Mathewson [Thu, 8 May 2014 03:04:22 +0000 (23:04 -0400)] 
Merge remote-tracking branch 'public/update_ciphers_ff28' into maint-0.2.4

11 years agoMerge remote-tracking branch 'public/bug11737_diagnostic'
Nick Mathewson [Thu, 8 May 2014 02:52:44 +0000 (22:52 -0400)] 
Merge remote-tracking branch 'public/bug11737_diagnostic'

11 years agoImprove bug11743 message a bit.
Nick Mathewson [Thu, 8 May 2014 02:23:19 +0000 (22:23 -0400)] 
Improve bug11743 message a bit.

11 years agoMerge remote-tracking branch 'public/bug8387_diagnostic'
Nick Mathewson [Thu, 8 May 2014 02:15:24 +0000 (22:15 -0400)] 
Merge remote-tracking branch 'public/bug8387_diagnostic'

11 years agoBetter log message for 8387 diagnostic
Nick Mathewson [Thu, 8 May 2014 02:13:29 +0000 (22:13 -0400)] 
Better log message for 8387 diagnostic

11 years agoAlways finalize a zlib stream of server descriptors.
Nick Mathewson [Wed, 7 May 2014 14:23:08 +0000 (10:23 -0400)] 
Always finalize a zlib stream of server descriptors.

Possible fix for bug 11648.

11 years agoScript to detect unused autoconf outputs
Nick Mathewson [Wed, 7 May 2014 07:56:51 +0000 (03:56 -0400)] 
Script to detect unused autoconf outputs

Should help speed up mingw builds by a percent or two.

11 years agoFix test_pick_circid on 32-bit platforms
Nick Mathewson [Wed, 7 May 2014 07:27:49 +0000 (03:27 -0400)] 
Fix test_pick_circid on 32-bit platforms

11 years agoBasic tests for get_unique_circ_id_by_chan.
Nick Mathewson [Wed, 7 May 2014 06:57:50 +0000 (02:57 -0400)] 
Basic tests for get_unique_circ_id_by_chan.

11 years agoQuick-and-dirty test for packed_cell_is_destroy
Nick Mathewson [Wed, 7 May 2014 06:05:35 +0000 (02:05 -0400)] 
Quick-and-dirty test for packed_cell_is_destroy

11 years agoMove code-generation scripts to scripts/codegen
Nick Mathewson [Wed, 7 May 2014 05:17:41 +0000 (01:17 -0400)] 
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.

11 years agoREADME file for the scripts directory
Nick Mathewson [Wed, 7 May 2014 05:10:28 +0000 (01:10 -0400)] 
README file for the scripts directory

11 years agoAdd a README file for the contrib directory
Nick Mathewson [Wed, 7 May 2014 05:03:35 +0000 (01:03 -0400)] 
Add a README file for the contrib directory

11 years agoMention siphash in src/ext/README
Nick Mathewson [Wed, 7 May 2014 05:03:14 +0000 (01:03 -0400)] 
Mention siphash in src/ext/README

11 years agoRemove a spurious variable.
Nick Mathewson [Wed, 7 May 2014 00:46:26 +0000 (20:46 -0400)] 
Remove a spurious variable.

11 years agoMerge remote-tracking branch 'public/bug11750'
Nick Mathewson [Wed, 7 May 2014 00:44:41 +0000 (20:44 -0400)] 
Merge remote-tracking branch 'public/bug11750'

11 years agoMerge branch 'bug11743_option_b'
Nick Mathewson [Wed, 7 May 2014 00:40:40 +0000 (20:40 -0400)] 
Merge branch 'bug11743_option_b'

11 years agoUnit test for dirvote_create_microdescriptor
Nick Mathewson [Wed, 7 May 2014 00:36:19 +0000 (20:36 -0400)] 
Unit test for dirvote_create_microdescriptor

11 years agoUnit test for write_to_buf_zlib
Nick Mathewson [Tue, 6 May 2014 23:29:56 +0000 (19:29 -0400)] 
Unit test for write_to_buf_zlib

11 years agoFuture-proof "id" lines against proposal 220.
Nick Mathewson [Tue, 6 May 2014 21:10:59 +0000 (17:10 -0400)] 
Future-proof "id" lines against proposal 220.

11 years agofix a copy-paste comment mistake
Nick Mathewson [Tue, 6 May 2014 21:09:16 +0000 (17:09 -0400)] 
fix a copy-paste comment mistake

11 years agochanges file for bug11743
Nick Mathewson [Tue, 6 May 2014 20:28:34 +0000 (16:28 -0400)] 
changes file for bug11743

11 years agoMerge remote-tracking branch 'karsten/bug11742'
Nick Mathewson [Tue, 6 May 2014 17:54:37 +0000 (13:54 -0400)] 
Merge remote-tracking branch 'karsten/bug11742'

11 years agoCheck HT_REP_IS_BAD_() when giving a bug-7164 warning.
Nick Mathewson [Tue, 6 May 2014 17:03:24 +0000 (13:03 -0400)] 
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.

11 years agoAdd a siphash benchmark.
Nick Mathewson [Tue, 6 May 2014 16:55:39 +0000 (12:55 -0400)] 
Add a siphash benchmark.

11 years agoFaster chan_circid_entry_hash implementation
Nick Mathewson [Tue, 6 May 2014 16:27:18 +0000 (12:27 -0400)] 
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.

11 years agoFix compilation with DEBUG_DNS_CACHE
Nick Mathewson [Tue, 6 May 2014 14:18:34 +0000 (10:18 -0400)] 
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.

11 years agoUse siphash on channel/circuit-id map too
Nick Mathewson [Mon, 5 May 2014 16:13:33 +0000 (12:13 -0400)] 
Use siphash on channel/circuit-id map too

Fixes ticket 11750.

11 years agoFix cross-compiling when 128-bit math compiles but won't link
Nick Mathewson [Mon, 5 May 2014 15:44:02 +0000 (11:44 -0400)] 
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'.

11 years agoConsensus method 18: Add a base64 ID digest to the microdesc
Nick Mathewson [Mon, 5 May 2014 15:28:25 +0000 (11:28 -0400)] 
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.

11 years agoDon't start sandbox except for CMD_RUN_TOR
Nick Mathewson [Mon, 5 May 2014 14:29:35 +0000 (10:29 -0400)] 
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.

11 years agoRemove /tor/dbg-stability.txt URL.
Karsten Loesing [Mon, 5 May 2014 09:21:35 +0000 (11:21 +0200)] 
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.

11 years agoTweak the changelog formatter a little.
Nick Mathewson [Fri, 2 May 2014 16:50:23 +0000 (12:50 -0400)] 
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.)

11 years agoFix test_config_write_to_data_subdir
Nick Mathewson [Thu, 1 May 2014 17:27:20 +0000 (13:27 -0400)] 
Fix test_config_write_to_data_subdir

Bugfix on aa0eb2022342798fc78b2bde89d393f37c59fe78; bugfix not on any
released Tor.

11 years agohave only one code path for #9635 logging
Nick Mathewson [Thu, 1 May 2014 16:40:33 +0000 (12:40 -0400)] 
have only one code path for #9635 logging

11 years agoMerge remote-tracking branch 'public/bug9635'
Nick Mathewson [Thu, 1 May 2014 16:39:39 +0000 (12:39 -0400)] 
Merge remote-tracking branch 'public/bug9635'

11 years agoMerge remote-tracking branch 'public/bug11233_diagnose'
Nick Mathewson [Thu, 1 May 2014 16:37:16 +0000 (12:37 -0400)] 
Merge remote-tracking branch 'public/bug11233_diagnose'

11 years agoMerge branch 'bug11654_squashed'
Nick Mathewson [Thu, 1 May 2014 16:34:59 +0000 (12:34 -0400)] 
Merge branch 'bug11654_squashed'

11 years agoFix a misuse of strlcpy() introduced by the #11156 patch.
George Kadianakis [Thu, 1 May 2014 13:44:29 +0000 (14:44 +0100)] 
Fix a misuse of strlcpy() introduced by the #11156 patch.

11 years agowhitespace fix
Nick Mathewson [Thu, 1 May 2014 16:31:38 +0000 (12:31 -0400)] 
whitespace fix

11 years agoMerge remote-tracking branch 'public/valgrind_tests'
Nick Mathewson [Thu, 1 May 2014 16:29:31 +0000 (12:29 -0400)] 
Merge remote-tracking branch 'public/valgrind_tests'

11 years agoMerge remote-tracking branch 'public/bug4345a_024'
Nick Mathewson [Thu, 1 May 2014 16:13:07 +0000 (12:13 -0400)] 
Merge remote-tracking branch 'public/bug4345a_024'

11 years agoMerge remote-tracking branch 'public/bug10849_025'
Nick Mathewson [Thu, 1 May 2014 15:51:22 +0000 (11:51 -0400)] 
Merge remote-tracking branch 'public/bug10849_025'

Conflicts:
src/or/config.c

11 years agoMerge remote-tracking branch 'origin/maint-0.2.4'
Nick Mathewson [Thu, 1 May 2014 15:45:38 +0000 (11:45 -0400)] 
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)

11 years agoMerge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
Nick Mathewson [Thu, 1 May 2014 15:44:25 +0000 (11:44 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4

Conflicts:
src/or/microdesc.c

11 years agoDowngrade bug 7164 warning to INFO
Nick Mathewson [Thu, 1 May 2014 15:42:02 +0000 (11:42 -0400)] 
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.

11 years agoChanges file for bug 11623 (fix was in 91ff10f6be9)
Nick Mathewson [Thu, 1 May 2014 15:33:17 +0000 (11:33 -0400)] 
Changes file for bug 11623 (fix was in 91ff10f6be9)

11 years agoMerge remote-tracking branch 'andrea/bug11476'
Nick Mathewson [Thu, 1 May 2014 15:30:55 +0000 (11:30 -0400)] 
Merge remote-tracking branch 'andrea/bug11476'

11 years agoMerge remote-tracking branch 'origin/maint-0.2.4'
Nick Mathewson [Thu, 1 May 2014 00:26:55 +0000 (20:26 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.4'

11 years agoMerge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
Nick Mathewson [Thu, 1 May 2014 00:25:15 +0000 (20:25 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4

11 years agoMerge remote-tracking branch 'public/bug10849_023_bruteforce' into maint-0.2.3
Nick Mathewson [Thu, 1 May 2014 00:23:22 +0000 (20:23 -0400)] 
Merge remote-tracking branch 'public/bug10849_023_bruteforce' into maint-0.2.3

11 years agoMerge remote-tracking branch 'public/bug11628'
Nick Mathewson [Wed, 30 Apr 2014 21:21:15 +0000 (17:21 -0400)] 
Merge remote-tracking branch 'public/bug11628'

11 years agoMore .gitignore tweaks; goodbye latex; hello trs
Nick Mathewson [Wed, 30 Apr 2014 17:19:19 +0000 (13:19 -0400)] 
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.

11 years agoUpdate .gitignore for doc, contrib changes
Nick Mathewson [Wed, 30 Apr 2014 14:58:18 +0000 (10:58 -0400)] 
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

11 years agoMerge remote-tracking branch 'origin/maint-0.2.4'
Nick Mathewson [Wed, 30 Apr 2014 01:08:26 +0000 (21:08 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.4'

Doing an "ours" merge to avoid taking 35699ef9f5d2814203653e16c, which is
a cherry-picked backport of 9686.

11 years agoDrop the MaxMemInCellQueues lower limit down to 256 MB.
Nick Mathewson [Wed, 20 Nov 2013 17:12:47 +0000 (12:12 -0500)] 
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 647248729fa65f0e51d062e2af8f4e8b38592bf5 to 0.2.4.

Note that in 0.2.4, the option is called MaxMemInCellQueues.

11 years agoMerge remote-tracking branch 'public/bug11605_024'
Nick Mathewson [Tue, 29 Apr 2014 18:33:39 +0000 (14:33 -0400)] 
Merge remote-tracking branch 'public/bug11605_024'

11 years agoLog info on ancient one-hop circuits in heartbeat
Nick Mathewson [Tue, 29 Apr 2014 18:02:12 +0000 (14:02 -0400)] 
Log info on ancient one-hop circuits in heartbeat

This is an attempt to diagnose 8387.

11 years agochanges file for last patch
Nick Mathewson [Tue, 29 Apr 2014 17:23:54 +0000 (13:23 -0400)] 
changes file for last patch

11 years agoQuench gcc's complaints about discarding constness in TO_ORIGIN_CIRCUIT.
dana koch [Tue, 29 Apr 2014 01:02:59 +0000 (11:02 +1000)] 
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.

11 years agoPut tor.service in the right place, and autoconfify it
Nick Mathewson [Tue, 29 Apr 2014 16:15:40 +0000 (12:15 -0400)] 
Put tor.service in the right place, and autoconfify it

This closes 8368.

11 years agoAdd contrib/tor.service for use with systemd
Jamie Nguyen [Mon, 21 Apr 2014 13:47:44 +0000 (14:47 +0100)] 
Add contrib/tor.service for use with systemd

11 years agoMerge remote-tracking branch 'origin/maint-0.2.4'
Nick Mathewson [Tue, 29 Apr 2014 17:03:27 +0000 (13:03 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.4'

11 years agoMerge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
Nick Mathewson [Tue, 29 Apr 2014 17:02:18 +0000 (13:02 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4

11 years agoStop leaking memory in error cases of md parsing
Nick Mathewson [Sat, 26 Apr 2014 16:45:34 +0000 (12:45 -0400)] 
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.

11 years agoChanges file for valgrind fixes
Nick Mathewson [Tue, 29 Apr 2014 16:53:19 +0000 (12:53 -0400)] 
Changes file for valgrind fixes

11 years agoFix leaks in tests related to setting options->DataDirectory
Nick Mathewson [Sat, 26 Apr 2014 18:48:30 +0000 (14:48 -0400)] 
Fix leaks in tests related to setting options->DataDirectory

We pre-populate that value in main(), and we weren't freeing it
before overriding it.

11 years agoFix memory leaks in test_status.c
Nick Mathewson [Sat, 26 Apr 2014 17:39:15 +0000 (13:39 -0400)] 
Fix memory leaks in test_status.c

11 years agoFix leaks in dir voting tests
Nick Mathewson [Sat, 26 Apr 2014 17:32:36 +0000 (13:32 -0400)] 
Fix leaks in dir voting tests

11 years agoChanges file for bug 11632.
Nick Mathewson [Tue, 29 Apr 2014 15:58:43 +0000 (11:58 -0400)] 
Changes file for bug 11632.

11 years agoSearch for python by looking for "python2.7" and "python3.3" as well.
dana koch [Tue, 29 Apr 2014 00:45:16 +0000 (10:45 +1000)] 
Search for python by looking for "python2.7" and "python3.3" as well.

11 years agoMake --disable-buf-freelists build and pass unit tests
Andrea Shepard [Tue, 29 Apr 2014 09:18:34 +0000 (02:18 -0700)] 
Make --disable-buf-freelists build and pass unit tests

11 years agoMerge remote-tracking branch 'public/bug11608'
Nick Mathewson [Mon, 28 Apr 2014 19:52:57 +0000 (15:52 -0400)] 
Merge remote-tracking branch 'public/bug11608'

11 years agochanges file for 11634 documentation fixes
Nick Mathewson [Mon, 28 Apr 2014 16:40:23 +0000 (12:40 -0400)] 
changes file for 11634 documentation fixes

11 years agoProvide missing documentation for two options. For 11634.
Nick Mathewson [Mon, 28 Apr 2014 16:37:47 +0000 (12:37 -0400)] 
Provide missing documentation for two options. For 11634.

11 years agoFix capitalization of MaxMemInQueues
Nick Mathewson [Mon, 28 Apr 2014 16:25:52 +0000 (12:25 -0400)] 
Fix capitalization of MaxMemInQueues

This won't affect anybody's configuration, but it makes it match what
we documented. Fixes part of 11634.

11 years agoRemove documentation for obsolete FetchV2Networkstatus
Nick Mathewson [Mon, 28 Apr 2014 16:25:49 +0000 (12:25 -0400)] 
Remove documentation for obsolete FetchV2Networkstatus

11 years agoRemove a spurious anchor in the manpage. part of 11634.
Nick Mathewson [Mon, 28 Apr 2014 16:25:20 +0000 (12:25 -0400)] 
Remove a spurious anchor in the manpage. part of 11634.

11 years agoFix some option names in the manpage.
Nick Mathewson [Mon, 28 Apr 2014 16:24:33 +0000 (12:24 -0400)] 
Fix some option names in the manpage.

Found with 'make check-docs'.  Part of 11634.

11 years agoActually put ExtORPortCookieAuthFile into config.c
Nick Mathewson [Mon, 28 Apr 2014 16:23:18 +0000 (12:23 -0400)] 
Actually put ExtORPortCookieAuthFile into config.c

Fixes bug 11635; bugfix on 0.2.5.1-alpha.

11 years agoRemove privoxy from 'see also' section on manpage.
Nick Mathewson [Mon, 28 Apr 2014 16:08:42 +0000 (12:08 -0400)] 
Remove privoxy from 'see also' section on manpage.

11 years agoFix the check-docs script
Nick Mathewson [Mon, 28 Apr 2014 16:07:57 +0000 (12:07 -0400)] 
Fix the check-docs script

We broke it when we added anchors to the manpage.

This patch fixes it, and makes it sorta detect missing anchors.

11 years agoMerge branch 'bug8966_v5'
Nick Mathewson [Mon, 28 Apr 2014 16:00:50 +0000 (12:00 -0400)] 
Merge branch 'bug8966_v5'

11 years agoDeal with the aftermath of sorting contrib
Nick Mathewson [Mon, 28 Apr 2014 15:59:55 +0000 (11:59 -0400)] 
Deal with the aftermath of sorting contrib

This basically amounts to grepping for every file that mentioned
contrib and adjusting its references to refer to the right place.

11 years agoClean the contrib directory with torch and machete.
Nick Mathewson [Mon, 28 Apr 2014 15:34:53 +0000 (11:34 -0400)] 
Clean the contrib directory with torch and machete.

We've accumulated a lot of cruft in this directory over the years: so
much, that it passed the point of being so disorganized that we no
longer browsed through it to see how bad it had gotten.

This patch (based on changes by rl1987) tries to remove the most
useless items, and split the others into reasonable directories.  It
creates a new scripts/ directory for maint and test scripts.

This patch was generated with the script below.  No other changes are made in
this patch.

#############
# new directories
mkdir -p contrib/test-tools
mkdir -p contrib/or-tools
mkdir -p contrib/dirauth-tools
mkdir -p contrib/operator-tools
mkdir -p contrib/client-tools
mkdir -p contrib/test-tools
mkdir -p contrib/dist
mkdir -p contrib/dist/suse
mkdir -p contrib/win32build

mkdir -p scripts/maint
mkdir -p scripts/test

############
# Deleted -- nobody who wants this is going to be looking for it here any
# longer.  Also, nobody wants it.
git rm contrib/auto-naming/README

# Deleted: We no longer do polipo.
git rm contrib/polipo/Makefile.mingw
git rm contrib/polipo/README
git rm contrib/polipo/polipo-mingw.nsi

# We haven't even tried to run this for ages. It is a relic of a bygone era
git rm contrib/mdd.py

# contrib/dir-tools/directory-archive/
# Tools for running a directory archive. No longer used - deleting them.
git rm contrib/directory-archive/crontab.sample
git rm contrib/directory-archive/fetch-all
git rm contrib/directory-archive/fetch-all-v3
git rm contrib/directory-archive/tar-them-up
git rm contrib/directory-archive/fetch-all-functions
git rm contrib/directory-archive/sort-into-month-folder

# This appears to be related to very old windows packaging stuff.
git rm contrib/bundle.nsi
git rm contrib/package_nsis-weasel.sh
git rm contrib/package_nsis.sh
git rm contrib/netinst.nsi
git rm contrib/torinst32.ico
git rm contrib/xenobite.ico

# This should not be needed for cross-compilation any more, should it?
git rm contrib/cross.sh

# I don't think anyone ever used this.
git rm contrib/make-signature.sh

# These are attempts to send tor controller commands from the command-line.
# They don't support modern authentication.
git rm contrib/tor-ctrl.sh

# this is for fetching about a tor server from a dirauth. But it
# doesn't authenticate the dirauth: yuck.
git rm contrib/sd

# wow, such unused, very perl4.
git rm contrib/tor-stress

####### contrib/dirauth-tools/
# Tools for running a directory authority

git mv contrib/add-tor contrib/dirauth-tools/
git mv contrib/nagios-check-tor-authority-cert contrib/dirauth-tools/

#######
# contrib/or-tools/
# Tools for examining relays
git mv contrib/check-tor contrib/or-tools/check-tor
git mv contrib/checksocks.pl contrib/or-tools/checksocks.pl
git mv contrib/exitlist contrib/or-tools/exitlist

#######
# contrib/operator-tools

# Tools for running a relay.
git mv contrib/linux-tor-prio.sh contrib/operator-tools/linux-tor-prio.sh
git mv contrib/tor-exit-notice.html contrib/operator-tools/tor-exit-notice.html
git mv contrib/tor.logrotate.in contrib/operator-tools/

######
# contrib/dist

git mv contrib/rc.subr contrib/dist/
git mv contrib/tor.sh.in contrib/dist/
git mv contrib/torctl.in contrib/dist/
git mv contrib/suse/* contrib/dist/suse/

######
# client-tools
git mv contrib/torify contrib/client-tools/torify
git mv contrib/tor-resolve.py contrib/client-tools/

######
# win32build

git mv contrib/package_nsis-mingw.sh contrib/win32build/
git mv contrib/tor.nsi.in contrib/win32build/
# Erinn didn't ask for this...
git mv contrib/tor-mingw.nsi.in contrib/win32build/
git mv contrib/tor.ico contrib/win32build/

######
# scripts/test
git mv contrib/cov-blame scripts/test/cov-blame
git mv contrib/cov-diff scripts/test/cov-diff
git mv contrib/coverage scripts/test/coverage
git mv contrib/scan-build.sh scripts/test/

######## scripts/maint
# Maintainance scripts
#
# These are scripts for developers to use when hacking on Tor.  They mostly
# look at the Tor source in one way or another.
git mv contrib/findMergedChanges.pl scripts/maint/findMergedChanges.pl
git mv contrib/checkOptionDocs.pl scripts/maint/checkOptionDocs.pl
git mv contrib/checkSpace.pl scripts/maint/checkSpace.pl
git mv contrib/redox.py scripts/maint/redox.py
git mv contrib/updateVersions.pl scripts/maint/updateVersions.pl
git mv contrib/checkLogs.pl scripts/maint/checkLogs.pl
git mv contrib/format_changelog.py scripts/maint/

11 years agoNew --disable-seccomp option to turn off support for seccomp.
Nick Mathewson [Mon, 28 Apr 2014 15:11:11 +0000 (11:11 -0400)] 
New --disable-seccomp option to turn off support for seccomp.

Fixes 11628.