torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity
20,037 Commits 53 Branches 631 Tags
ce9bd4e04ce54b6b001c096f7caab2d0beaef941
Commit Graph

20037 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
cypherpunks ce9bd4e04c Do not distribute common_sha1.i and or_sha1.i. 
These files get generated automatically so there is need to include them in the
distribution.
 2015-03-14 13:00:06 -04:00
cypherpunks eeb753e871 Make check-docs work from out-of-tree builds. 2015-03-14 13:00:06 -04:00
cypherpunks e656a88fad Add changes file for 15053. 2015-03-14 13:00:05 -04:00
cypherpunks 918ce27c31 Warn users trying to generate a coverage report when not configured as such. 2015-03-14 13:00:05 -04:00
cypherpunks 45db963de4 Stop updating versions on every execution of ./configure. 2015-03-14 13:00:05 -04:00
cypherpunks 5176f6f103 Remove relative paths to header files. 
The paths are already in the directory search path of the compiler therefore no
need to include them in the source code.
 2015-03-14 13:00:05 -04:00
cypherpunks 7a86d53dee Clean up generated files. 
Remove src/or/or_sha1.i and src/common/common_sha1.i on `make clean` and remove
the temporary micro-revision file when its no longer needed.

Additional changes;
- show a message when generating the micro-revision file.
- add the temporary micro revision file to the list of files to be removed on
  `make clean` just in case.
- fix indentation of the make rule to improve readability.
 2015-03-14 13:00:04 -04:00
cypherpunks 17cbc4350f Use output variables instead of relative paths. 
Fixes the following rules in out-of-tree builds;
- check-spaces
- check-docs
- check-logs
- Doxygen
- coverage-html

And cleans up additional directories;
- coverage_html
- doc/doxygen
 2015-03-14 13:00:04 -04:00
Nick Mathewson 4247ce99e5 ug. test, _then_ commit, nick. 2015-03-14 12:14:32 -04:00
Nick Mathewson f70f1d283e Do not printf success messages when we are --quieted or --hushed. 
Fixes 14994. Calling this a bug on when --quiet and --hush began to have
their current behavior.
 2015-03-14 12:12:53 -04:00
Nick Mathewson 3a68f2f54e const-ify the new failure vars, and one old one 2015-03-13 09:41:49 -04:00
Nick Mathewson 833b6d30be Merge remote-tracking branch 'sebastian/bug15211' 2015-03-13 09:39:04 -04:00
Sebastian Hahn badc81de5b Don't init hs intro key as side effect of an assert 2015-03-12 18:59:46 +01:00
Sebastian Hahn 447769dd28 Don't init control authchallenge nonce as assert side effect 
Fixes part of bug 15211.
 2015-03-12 18:57:57 +01:00
Nick Mathewson 3ee2fca7ca Merge remote-tracking branch 'origin/maint-0.2.6' 2015-03-12 13:16:22 -04:00
Nick Mathewson eb68ea20f8 Merge remote-tracking branch 'public/feature15212_026' into maint-0.2.6 2015-03-12 13:15:08 -04:00
Nick Mathewson 16b1b2199d Merge remote-tracking branch 'origin/maint-0.2.6' 2015-03-12 13:13:06 -04:00
Yawning Angel b3281fc6d6 Initialize the extorport auth cookie before launching PTs. 
PTs expect the auth cookie to be available immedieately after launch,
leading to a race condition when PTs opt to cache the extorport cookie
once immediately after startup.

Fixes #15240.
 2015-03-12 13:12:56 -04:00
Nick Mathewson 0f628d6560 Added a comment to tor.service.in 
This explains that if you change your torrc to do more, you might
need to change tor.service.in to allow it.  See #15195.
 2015-03-12 13:11:53 -04:00
Nick Mathewson d5cbc58094 Merge remote-tracking branch 'origin/maint-0.2.6' 2015-03-12 12:53:31 -04:00
Sebastian Hahn 68e9f364a0 don't init threads as side effect of assertion 
Fixes part of bug 15211.
 2015-03-12 17:52:37 +01:00
Nick Mathewson c2dcd9b703 Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6 
("-s ours" merge to avoid taking reversion of #15064)
 2015-03-12 12:51:20 -04:00
Nick Mathewson 9063f29160 Revert "Make TransProxyType ipfw work correctly" 
This reverts commit 681802817d.

(I didn't mean to backport this, but somehow I had based my branch
for #15205 on it.)
 2015-03-12 12:49:08 -04:00
Nick Mathewson 689562ab48 Merge remote-tracking branch 'origin/maint-0.2.6' 2015-03-12 12:27:54 -04:00
Nick Mathewson 8a060d8643 Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6 2015-03-12 12:27:42 -04:00
Nick Mathewson eecd410984 Merge remote-tracking branch 'public/bug15205_025' into maint-0.2.5 2015-03-12 12:27:25 -04:00
Nick Mathewson b683b9af00 Merge remote-tracking branch 'origin/maint-0.2.6' 2015-03-12 11:37:56 -04:00
Nick Mathewson 1a1d431cff Merge branch 'bug15245_026' into maint-0.2.6 2015-03-12 11:37:02 -04:00
Nick Mathewson d4c1716263 add an explanatory comment 2015-03-12 11:28:18 -04:00
Nick Mathewson 648af0438d Also, add an assertion to assign_onionskin_to_cpuworker 2015-03-12 11:15:50 -04:00
Nick Mathewson 66c8180207 Fix crash bug when calling cpuworkers_rotate_keyinfo on a client. 
Fixes bug 15245; bugfix on 0.2.6.3-alpha. Thanks to anonym for reporting!
 2015-03-12 11:14:39 -04:00
Nick Mathewson a46f4982c2 Merge remote-tracking branch 'origin/maint-0.2.6' 2015-03-12 10:54:30 -04:00
Nick Mathewson 354897a13e Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6 2015-03-12 10:54:13 -04:00
Nick Mathewson a00d07ac1b Bump 025 version to 0.2.5.11 2015-03-12 10:52:09 -04:00
Nick Mathewson b563082ad8 Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5 2015-03-12 10:51:08 -04:00
Nick Mathewson 5f46a59ba3 Bump 0.2.4 version. 2015-03-12 10:50:15 -04:00
Nick Mathewson 2bfdfc849b Merge remote-tracking branch 'origin/maint-0.2.6' 2015-03-12 10:06:10 -04:00
Nick Mathewson a95e18b358 Merge branch 'bug9495_redux_v2' into maint-0.2.6 2015-03-12 10:05:06 -04:00
Nick Mathewson 192ed94410 Use PTHREAD_CREATE_DETACHED macro instead of 1: fix Solaris crash 
When calling pthread_attr_setdetachstate, we were using 1 as the
argument. But the pthreads documentation says that you have to say
PTHREAD_CREATE_DETACH, which on Solaris is apparently 0x40.  Calling
pthread_attr_setdetachstate with 1 crashes on Solaris with FLTBOUNDS.

(Because we're so late in the release cycle, I made the code define
PTHREAD_CREATE_DETACHED if it doesn't exist, so we aren't likely to
break any other platforms.)

This bug was introduced when we made threading mandatory in
0.2.6.1-alpha; previously, we had force-disabled threading on
Solaris.  See #9495 discussion.
 2015-03-12 10:03:02 -04:00
Nick Mathewson 189f357f97 Merge remote-tracking branch 'origin/maint-0.2.6' 2015-03-10 10:10:44 -04:00
Nick Mathewson 985687bc4f Fix check-spaces 2015-03-10 10:10:35 -04:00
Nick Mathewson d29a8ad564 Add link protocol version counts to the heartbeat message 
Closes ticket 15212
 2015-03-10 10:07:41 -04:00
Nick Mathewson 28b4ab784d Remove one changes files from master (0.2.7) that already got merged into changelogs for 0.2.6.4-rc 2015-03-10 08:46:21 -04:00
Nick Mathewson bd00c152bb Remove the changes files from master (0.2.7) that already got merged into changelogs for 0.2.6.4-rc or earlier. 2015-03-10 08:45:26 -04:00
Nick Mathewson 87993072ee forward-port the 0.2.6.4-0rc changelog 2015-03-10 08:40:13 -04:00
Nick Mathewson 86d4704483 Whoops; I somehow dropped 9321 from the changelog 2015-03-10 08:39:37 -04:00
Nick Mathewson bc6dcac353 Merge remote-tracking branch 'origin/maint-0.2.6' 2015-03-10 08:37:08 -04:00
Nick Mathewson e732ec295d Merge commit 'origin/maint-0.2.6^' 2015-03-10 08:36:53 -04:00
Nick Mathewson 99b59dee70 bump 0.2.6 to 0.2.6.4-rc-dev 2015-03-10 08:20:47 -04:00
Nick Mathewson 1af67d7f72 Merge remote-tracking branch 'public/bug15205_025' into maint-0.2.6 2015-03-09 19:47:12 -04:00