Nick Mathewson
60d147fb9e
Remove changes files for patches in 0.2.6.6 or earlier.
2015-03-24 09:38:46 -04:00
Nick Mathewson
95530bac83
Start adding people to the packager list in doc/HACKING
2015-03-24 09:29:28 -04:00
Nick Mathewson
190ed66b06
Merge remote-tracking branch 'origin/maint-0.2.6'
2015-03-23 09:25:35 -04:00
Nick Mathewson
c113544a94
Merge remote-tracking branch 'public/bug15436_025' into maint-0.2.6
2015-03-23 09:25:15 -04:00
Yawning Angel
732f522a42
Fix unaligned access in SipHash-2-4.
...
The compiler is allowed to assume that a "uint64_t *" is aligned
correctly, and will inline a version of memcpy that acts as such.
Use "uint8_t *", so the compiler does the right thing.
2015-03-23 09:20:02 -04:00
Nick Mathewson
98c3942162
Merge remote-tracking branch 'origin/maint-0.2.6'
2015-03-18 16:33:11 -04:00
Nick Mathewson
ca03b10b0c
bump to 0.2.6.5-rc.dev
2015-03-18 16:32:13 -04:00
Nick Mathewson
6c26483e69
forward-port 0.2.6.5-rc changelog.
2015-03-18 16:30:08 -04:00
Nick Mathewson
54d6e5e71e
Merge remote-tracking branch 'public/feature15053'
2015-03-18 14:27:00 -04:00
Nick Mathewson
9bdce9d4e5
Merge remote-tracking branch 'origin/maint-0.2.6'
2015-03-18 09:11:34 -04:00
Nick Mathewson
77c671b7dd
bump to 0.2.6.5-rc
2015-03-18 09:10:48 -04:00
Nick Mathewson
d8263ac254
Merge remote-tracking branch 'origin/maint-0.2.6'
2015-03-18 08:58:15 -04:00
Nick Mathewson
548b4be163
Forward-port changelog and releasenotes
2015-03-17 10:54:38 -04:00
Nick Mathewson
e75e0c7278
Make log.o depend on micro-revision.i
...
Otherwise micro-revision.i might not get built on time.
2015-03-15 17:09:58 -04:00
Nick Mathewson
efba2922ea
changes file for 15024
2015-03-15 08:26:43 -04:00
cypherpunks
36b9cccaba
Be consistent with capitalization, quoting, and spacing of help strings.
2015-03-15 08:25:36 -04:00
Nick Mathewson
a0f892f190
Simplify the loop.
2015-03-14 14:31:26 -04:00
Nick Mathewson
ddb1889eb8
Add comments for new functions
2015-03-14 14:28:29 -04:00
Nick Mathewson
92d04721a2
remove a needless "if (1)" that was there for indentation; fix indentation.
2015-03-14 14:28:29 -04:00
Nick Mathewson
b78803f9f5
Extract main part of main loop into a separate function
...
For 15176; Shadow would like this.
Based on a patch by Rob Jansen, but revised to have a minimal-sized diff.
2015-03-14 14:28:29 -04:00
Nick Mathewson
feca329031
Log version when LD_BUG is logged.
...
Closes ticket 15026.
2015-03-14 13:50:23 -04:00
Nick Mathewson
21fd94ddb8
add newly generated files to .gitignore
2015-03-14 13:04:03 -04:00
cypherpunks
e85ba7459e
Revive updateVersions.pl with make update-versions
.
2015-03-14 13:00:06 -04:00
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