]> git.ipfire.org Git - thirdparty/tor.git/log
thirdparty/tor.git
8 years agoMake consensus diff sha3 operations mockable.
Nick Mathewson [Tue, 7 Mar 2017 19:12:53 +0000 (14:12 -0500)] 
Make consensus diff sha3 operations mockable.

(We'll want this for fuzzing)

8 years agoString-based API for consensus diffs.
Nick Mathewson [Tue, 7 Mar 2017 18:45:32 +0000 (13:45 -0500)] 
String-based API for consensus diffs.

Also, add very strict split/join functions, and totally forbid
nonempty files that end with somethig besides a newline.  This
change is necessary to ensure that diff/apply are actually reliable
inverse operations.

8 years agoFix an abstraction violation.
Nick Mathewson [Tue, 7 Mar 2017 18:15:43 +0000 (13:15 -0500)] 
Fix an abstraction violation.

Don't alias the insides of smartlist_t; that way lies madness.

8 years agoUse "const" in consdiff.[ch]
Nick Mathewson [Tue, 7 Mar 2017 18:11:38 +0000 (13:11 -0500)] 
Use "const" in consdiff.[ch]

8 years agoprop140: Use sha3-256, not sha2-256
Nick Mathewson [Tue, 7 Mar 2017 18:02:00 +0000 (13:02 -0500)] 
prop140: Use sha3-256, not sha2-256

This is a protocol update from recent prop140 changes.

Also, per #21673, we need to check the entire document, including
signatures.

8 years agoAdd a couple more cases to reach 100% coverage.
Nick Mathewson [Tue, 7 Mar 2017 17:30:13 +0000 (12:30 -0500)] 
Add a couple more cases to reach 100% coverage.

8 years agoCover two more failing cases with unit tests
Nick Mathewson [Tue, 7 Mar 2017 17:04:45 +0000 (12:04 -0500)] 
Cover two more failing cases with unit tests

8 years agoFix an unreachable memory leak.
Nick Mathewson [Tue, 7 Mar 2017 16:47:19 +0000 (11:47 -0500)] 
Fix an unreachable memory leak.

Also add a missing newline.

8 years agoRemove digest[12]_hex
Nick Mathewson [Tue, 7 Mar 2017 16:42:24 +0000 (11:42 -0500)] 
Remove digest[12]_hex

8 years agoTweak&test log messages on apply_diff
Nick Mathewson [Tue, 7 Mar 2017 16:36:07 +0000 (11:36 -0500)] 
Tweak&test log messages on apply_diff

8 years agoFixes when applying diffs: Allow 2-line diffs, fix bogus free
Nick Mathewson [Tue, 7 Mar 2017 16:35:50 +0000 (11:35 -0500)] 
Fixes when applying diffs: Allow 2-line diffs, fix bogus free

The 2-line diff changs is needed to make the unit tests actually
test the cases that they thought they were testing.

The bogus free was found while testing those cases

8 years agoMark some warnings as bugs, and as (hopefully) unreachable.
Nick Mathewson [Tue, 7 Mar 2017 16:13:40 +0000 (11:13 -0500)] 
Mark some warnings as bugs, and as (hopefully) unreachable.

8 years agoCheck for expected warnings in apply_ed_diff
Nick Mathewson [Tue, 7 Mar 2017 16:08:51 +0000 (11:08 -0500)] 
Check for expected warnings in apply_ed_diff

8 years agoFix some logging on failed apply_ed_diff
Nick Mathewson [Tue, 7 Mar 2017 16:08:18 +0000 (11:08 -0500)] 
Fix some logging on failed apply_ed_diff

8 years agoNo need to end a log message with newline.
Nick Mathewson [Tue, 7 Mar 2017 15:48:03 +0000 (10:48 -0500)] 
No need to end a log message with newline.

8 years agotest operator cleanup
Nick Mathewson [Tue, 7 Mar 2017 15:46:24 +0000 (10:46 -0500)] 
test operator cleanup

8 years agoEnforce correct log messages on diff generation failure tests
Nick Mathewson [Tue, 7 Mar 2017 15:45:18 +0000 (10:45 -0500)] 
Enforce correct log messages on diff generation failure tests

8 years agoTest two more base64cmp cases.
Nick Mathewson [Tue, 7 Mar 2017 15:45:13 +0000 (10:45 -0500)] 
Test two more base64cmp cases.

8 years agoUse "STATIC" to export consdiff fns for testing
Nick Mathewson [Tue, 7 Mar 2017 15:22:00 +0000 (10:22 -0500)] 
Use "STATIC" to export consdiff fns for testing

Previously test_consdiff.c just did #include "consdiff.c", which is
not great style, and messes up coverage testing.

8 years agoConsensus diff backend from Daniel Martí GSOC project.
Daniel Martí [Tue, 7 Mar 2017 14:58:30 +0000 (09:58 -0500)] 
Consensus diff backend from Daniel Martí GSOC project.

(This commit was extracted by nickm based on the final outcome of
the project, taking only the changes in the files touched by this
commit from the consdiff_rebased branch.  The directory-system
changes are going to get worked on separately.)

8 years agoMerge branch 'maint-0.3.0'
Nick Mathewson [Tue, 7 Mar 2017 13:08:28 +0000 (08:08 -0500)] 
Merge branch 'maint-0.3.0'

8 years agoMerge branch 'bug21594_030_squashed' into maint-0.3.0
Nick Mathewson [Tue, 7 Mar 2017 13:05:16 +0000 (08:05 -0500)] 
Merge branch 'bug21594_030_squashed' into maint-0.3.0

8 years agoRemove delay in hidden service introduction point checks
teor [Thu, 2 Mar 2017 04:14:45 +0000 (15:14 +1100)] 
Remove delay in hidden service introduction point checks

Make hidden services with 8 to 10 introduction points check for failed
circuits immediately after startup. Previously, they would wait for 5
minutes before performing their first checks.

Fixes bug 21594; bugfix on commit 190aac0eab9 in Tor 0.2.3.9-alpha.
Reported by alecmuffett.

8 years agoMerge remote-tracking branch 'ahf/bugs/20988'
Nick Mathewson [Mon, 6 Mar 2017 17:04:58 +0000 (12:04 -0500)] 
Merge remote-tracking branch 'ahf/bugs/20988'

8 years agoMerge remote-tracking branch 'teor/bug19699'
Nick Mathewson [Mon, 6 Mar 2017 16:52:17 +0000 (11:52 -0500)] 
Merge remote-tracking branch 'teor/bug19699'

8 years agoFix a function name in a comment. Closes 21580
Nick Mathewson [Mon, 6 Mar 2017 16:27:50 +0000 (11:27 -0500)] 
Fix a function name in a comment. Closes 21580

8 years agoMerge branch 'feature21598_squashed'
Nick Mathewson [Sun, 5 Mar 2017 04:22:46 +0000 (23:22 -0500)] 
Merge branch 'feature21598_squashed'

8 years agoLog a message when a hidden service has fewer intro points than expected
teor [Thu, 2 Mar 2017 05:38:21 +0000 (16:38 +1100)] 
Log a message when a hidden service has fewer intro points than expected

Closes ticket 21598.

8 years agoMerge branch 'bug21599_squashed'
Nick Mathewson [Sun, 5 Mar 2017 04:16:29 +0000 (23:16 -0500)] 
Merge branch 'bug21599_squashed'

8 years agoSimplify hidden service descriptor creation
teor [Thu, 2 Mar 2017 04:55:33 +0000 (15:55 +1100)] 
Simplify hidden service descriptor creation

Use an existing flag to check if an introduction point is established.

Cleanup after 21596.

Fixes bug 21599; bugfix on 0.2.7.2-alpha.

8 years agoMerge remote-tracking branch 'teor/bug21596_030'
Nick Mathewson [Sun, 5 Mar 2017 04:10:40 +0000 (23:10 -0500)] 
Merge remote-tracking branch 'teor/bug21596_030'

8 years agoMerge branch 'maint-0.3.0'
Nick Mathewson [Sun, 5 Mar 2017 01:24:02 +0000 (20:24 -0500)] 
Merge branch 'maint-0.3.0'

8 years agoMerge remote-tracking branch 'teor/bug21576_029_v2' into maint-0.3.0
Nick Mathewson [Sun, 5 Mar 2017 01:23:38 +0000 (20:23 -0500)] 
Merge remote-tracking branch 'teor/bug21576_029_v2' into maint-0.3.0

8 years agoForward-port changelogs and releaesenotes to master.
Nick Mathewson [Fri, 3 Mar 2017 20:00:33 +0000 (15:00 -0500)] 
Forward-port changelogs and releaesenotes to master.

These are from today's stable releases in 0.2.4 through 0.2.8

8 years agoMake hidden services always check for failed intro point connections
teor [Thu, 2 Mar 2017 04:33:09 +0000 (15:33 +1100)] 
Make hidden services always check for failed intro point connections

Previously, they would stop checking when they exceeded their intro point
creation limit.

Fixes bug 21596; bugfix on commit d67bf8b2f23 in Tor 0.2.7.2-alpha.
Reported by alecmuffett.

8 years agoMake hidden services always check for failed intro point connections
teor [Thu, 2 Mar 2017 04:33:09 +0000 (15:33 +1100)] 
Make hidden services always check for failed intro point connections

Previously, they would stop checking when they exceeded their intro point
creation limit.

Fixes bug 21596; bugfix on commit d67bf8b2f23 in Tor 0.2.7.2-alpha.
Reported by alecmuffett.

8 years agoFix a crash when a connection tries to open just after it has been unlinked
teor [Wed, 1 Mar 2017 22:49:35 +0000 (09:49 +1100)] 
Fix a crash when a connection tries to open just after it has been unlinked

Fixes bug 21576; bugfix on Tor 0.2.9.3-alpha.
Reported by alecmuffett.

8 years agoForward-port 0.3.0.4-rc changelog
Nick Mathewson [Wed, 1 Mar 2017 20:39:52 +0000 (15:39 -0500)] 
Forward-port 0.3.0.4-rc changelog

8 years agoMerge branch 'maint-0.3.0'
Nick Mathewson [Wed, 1 Mar 2017 20:39:01 +0000 (15:39 -0500)] 
Merge branch 'maint-0.3.0'

"ours" to avoid version bump

8 years agoBump to 0.3.0.4-rc-dev
Nick Mathewson [Wed, 1 Mar 2017 20:38:36 +0000 (15:38 -0500)] 
Bump to 0.3.0.4-rc-dev

8 years agoReset `buf` after each succesful test to avoid artifacts.
Alexander Færøy [Mon, 27 Feb 2017 14:57:08 +0000 (15:57 +0100)] 
Reset `buf` after each succesful test to avoid artifacts.

This patch resets `buf` in test_util_fgets_eagain() after each succesful
ivocation to avoid stray artifacts left in the buffer by erroneous
tor_fgets() calls.

8 years agoUse tor_fgets() instead of fgets().
Alexander Færøy [Mon, 27 Feb 2017 14:42:57 +0000 (15:42 +0100)] 
Use tor_fgets() instead of fgets().

This patch changes our use of fgets() to tor_fgets() for more consistent
error handling across different versions of the C library.

8 years agoAdd compatibility function for fgets(3).
Alexander Færøy [Mon, 27 Feb 2017 14:37:31 +0000 (15:37 +0100)] 
Add compatibility function for fgets(3).

This patch adds the `tor_fgets()` function to our compatibility layer.

`tor_fgets()` adds an additional check for whether the error-bit have
been enabled for the given file stream, if that is the case and `errno`
is set to `EAGAIN` we make sure that we always return NULL.

Unfortunately `fgets(3)` behaves differently on different versions of
the C library.

See: https://bugs.torproject.org/21416
See: https://bugs.torproject.org/20988

8 years agoMerge branch 'maint-0.3.0'
Nick Mathewson [Wed, 1 Mar 2017 20:11:23 +0000 (15:11 -0500)] 
Merge branch 'maint-0.3.0'

8 years agoRestore correct behavior of 0.3.0.4-rc with bridges+ipv6-min
Nick Mathewson [Wed, 1 Mar 2017 20:02:16 +0000 (15:02 -0500)] 
Restore correct behavior of 0.3.0.4-rc with bridges+ipv6-min

In that chutney test, the bridge client is configured to connect to
the same bridge at 127.0.0.1:5003 _and_ at [::1]:5003, with no
change in transports.

That meant, I think, that the descriptor is only assigned to the
first bridge when it arrives, and never the second.

8 years agoMerge remote-tracking branch 'asn/bug21586'
Nick Mathewson [Wed, 1 Mar 2017 14:21:34 +0000 (09:21 -0500)] 
Merge remote-tracking branch 'asn/bug21586'

8 years agoMaster: remove 2 more changes files that are merged in 0.3.0.4-rc
Nick Mathewson [Wed, 1 Mar 2017 14:10:54 +0000 (09:10 -0500)] 
Master: remove 2 more changes files that are merged in 0.3.0.4-rc

8 years agoPrevent SRV assert when called from misconfigured bridge auth.
George Kadianakis [Wed, 1 Mar 2017 13:56:29 +0000 (15:56 +0200)] 
Prevent SRV assert when called from misconfigured bridge auth.

8 years agoMerge branch 'maint-0.3.0'
Nick Mathewson [Wed, 1 Mar 2017 13:54:58 +0000 (08:54 -0500)] 
Merge branch 'maint-0.3.0'

8 years agoImprove descriptor checks in the new guard algorithm.
George Kadianakis [Wed, 1 Mar 2017 10:38:12 +0000 (12:38 +0200)] 
Improve descriptor checks in the new guard algorithm.

- Make sure we check at least two guards for descriptor before making
  circuits. We typically use the first primary guard for circuits, but
  it can also happen that we use the second primary guard (e.g. if we
  pick our first primary guard as an exit), so we should make sure we
  have descriptors for both of them.

- Remove BUG() from the guard_has_descriptor() check since we now know
  that this can happen in rare but legitimate situations as well, and we
  should just move to the next guard in that case.

8 years agoMerge branch 'maint-0.3.0'
Nick Mathewson [Wed, 1 Mar 2017 13:19:45 +0000 (08:19 -0500)] 
Merge branch 'maint-0.3.0'

8 years agoMerge branch 'maint-0.2.9' into maint-0.3.0
Nick Mathewson [Wed, 1 Mar 2017 13:19:23 +0000 (08:19 -0500)] 
Merge branch 'maint-0.2.9' into maint-0.3.0

"Ours" merge to avoid version bump

8 years agoBump to 0.2.9.10-dev
Nick Mathewson [Wed, 1 Mar 2017 13:18:54 +0000 (08:18 -0500)] 
Bump to 0.2.9.10-dev

8 years agoPort 0.2.9.10 changelog and releasenotes to master
Nick Mathewson [Wed, 1 Mar 2017 13:17:52 +0000 (08:17 -0500)] 
Port 0.2.9.10 changelog and releasenotes to master

8 years agoMerge branch 'maint-0.3.0'
Nick Mathewson [Wed, 1 Mar 2017 12:52:51 +0000 (07:52 -0500)] 
Merge branch 'maint-0.3.0'

8 years agoMake test-network.sh always call chutney's test-network.sh
teor [Wed, 1 Mar 2017 02:28:30 +0000 (13:28 +1100)] 
Make test-network.sh always call chutney's test-network.sh

Previously, this only worked on systems which had bash installed, due to
some bash-specific code in the script.

Fixes bug 19699; follow-up to 21581.

8 years agoRemove the space before the interpreter name in test-network.sh
teor [Wed, 1 Mar 2017 01:28:16 +0000 (12:28 +1100)] 
Remove the space before the interpreter name in test-network.sh

Apparently some unixes don't like this.
Part of #21581.

8 years agoRemove the space before the interpreter name in test-network.sh
teor [Wed, 1 Mar 2017 01:28:16 +0000 (12:28 +1100)] 
Remove the space before the interpreter name in test-network.sh

Apparently some unixes don't like this.
Part of #21581.

8 years agoMerge branch 'maint-0.3.0'
Nick Mathewson [Wed, 1 Mar 2017 01:14:06 +0000 (20:14 -0500)] 
Merge branch 'maint-0.3.0'

8 years agoRemove a spurious test-network-all warning that triggers when sh is not bash
teor [Wed, 1 Mar 2017 00:54:31 +0000 (11:54 +1100)] 
Remove a spurious test-network-all warning that triggers when sh is not bash

Part of 21581.

8 years agoRestore support for test-network.sh on BSD and other systems without bash
teor [Wed, 1 Mar 2017 00:21:07 +0000 (11:21 +1100)] 
Restore support for test-network.sh on BSD and other systems without bash

(But use bash if it's available.)
This is a workaround until we remove bash-specific code in 19699.

Fixes bug 21581; bugfix on 21562, not in any released version of tor.

8 years agoMerge remote-tracking branch 'teor/bug21510'
Nick Mathewson [Tue, 28 Feb 2017 16:43:58 +0000 (11:43 -0500)] 
Merge remote-tracking branch 'teor/bug21510'

8 years agoMerge remote-tracking branch 'teor/test21470-029'
Nick Mathewson [Tue, 28 Feb 2017 16:31:07 +0000 (11:31 -0500)] 
Merge remote-tracking branch 'teor/test21470-029'

8 years agoMerge remote-tracking branch 'teor/bug21507-029'
Nick Mathewson [Tue, 28 Feb 2017 16:19:24 +0000 (11:19 -0500)] 
Merge remote-tracking branch 'teor/bug21507-029'

8 years agoMerge remote-tracking branch 'public/bug21407'
Nick Mathewson [Tue, 28 Feb 2017 16:17:30 +0000 (11:17 -0500)] 
Merge remote-tracking branch 'public/bug21407'

8 years agoMerge branch 'maint-0.3.0'
Nick Mathewson [Tue, 28 Feb 2017 15:40:34 +0000 (10:40 -0500)] 
Merge branch 'maint-0.3.0'

This is an "ours" merge to avoid a version bump.

8 years agobump version to 0.3.0.4-rc
Nick Mathewson [Tue, 28 Feb 2017 15:40:08 +0000 (10:40 -0500)] 
bump version to 0.3.0.4-rc

8 years agoMerge branch 'maint-0.2.9' into maint-0.3.0
Nick Mathewson [Tue, 28 Feb 2017 15:39:29 +0000 (10:39 -0500)] 
Merge branch 'maint-0.2.9' into maint-0.3.0

This is an "ours" merge to avoid a version bump.

8 years agobump version to 0.2.9.10
Nick Mathewson [Tue, 28 Feb 2017 15:38:55 +0000 (10:38 -0500)] 
bump version to 0.2.9.10

8 years agoMerge branch 'maint-0.2.8' into maint-0.2.9
Nick Mathewson [Tue, 28 Feb 2017 15:38:31 +0000 (10:38 -0500)] 
Merge branch 'maint-0.2.8' into maint-0.2.9

This is an "ours" merge to avoid taking a version bump

8 years agoMerge branch 'maint-0.2.7-redux' into maint-0.2.8
Nick Mathewson [Tue, 28 Feb 2017 15:37:25 +0000 (10:37 -0500)] 
Merge branch 'maint-0.2.7-redux' into maint-0.2.8

This is an "ours" merge to avoid taking a version bump, and to
avoid replaying the post-0.2.7.6 history of "maint-0.2.7-redux" onto maint-0.2.8, which already included the relevant changes.

8 years agobump version to 0.2.8.13
Nick Mathewson [Tue, 28 Feb 2017 15:34:33 +0000 (10:34 -0500)] 
bump version to 0.2.8.13

8 years agoBump version to 0.2.7.7
Nick Mathewson [Tue, 28 Feb 2017 15:27:20 +0000 (10:27 -0500)] 
Bump version to 0.2.7.7

8 years agoMerge branch 'maint-0.2.6' into maint-0.2.7-redux
Nick Mathewson [Tue, 28 Feb 2017 15:26:45 +0000 (10:26 -0500)] 
Merge branch 'maint-0.2.6' into maint-0.2.7-redux

"ours" merge to avoid version bumps

8 years agobump to 0.2.6.11
Nick Mathewson [Tue, 28 Feb 2017 15:26:24 +0000 (10:26 -0500)] 
bump to 0.2.6.11

8 years agoMerge branch 'maint-0.2.5' into maint-0.2.6
Nick Mathewson [Tue, 28 Feb 2017 15:25:51 +0000 (10:25 -0500)] 
Merge branch 'maint-0.2.5' into maint-0.2.6

"ours" merge to avoid version bumps

8 years agoBump version to 0.2.5.13
Nick Mathewson [Tue, 28 Feb 2017 15:23:20 +0000 (10:23 -0500)] 
Bump version to 0.2.5.13

8 years agoMerge branch 'maint-0.2.4' into maint-0.2.5
Nick Mathewson [Tue, 28 Feb 2017 15:22:36 +0000 (10:22 -0500)] 
Merge branch 'maint-0.2.4' into maint-0.2.5

"ours" merge to avoid bumping version

8 years agoBump to 0.2.4.28
Nick Mathewson [Tue, 28 Feb 2017 15:20:46 +0000 (10:20 -0500)] 
Bump to 0.2.4.28

8 years agoUpdate changelog sorting rules to know about dirauth changes
Nick Mathewson [Tue, 28 Feb 2017 15:12:17 +0000 (10:12 -0500)] 
Update changelog sorting rules to know about dirauth changes

8 years agoRemove changes files from master for items in <=0.3.0.4-rc
Nick Mathewson [Tue, 28 Feb 2017 14:27:04 +0000 (09:27 -0500)] 
Remove changes files from master for items in <=0.3.0.4-rc

8 years agoMerge branch 'maint-0.3.0'
Nick Mathewson [Tue, 28 Feb 2017 13:28:55 +0000 (08:28 -0500)] 
Merge branch 'maint-0.3.0'

8 years agoMerge remote-tracking branch 'public/bug21007_case2_030' into maint-0.3.0
Nick Mathewson [Tue, 28 Feb 2017 13:28:46 +0000 (08:28 -0500)] 
Merge remote-tracking branch 'public/bug21007_case2_030' into maint-0.3.0

8 years agoMerge branch 'maint-0.3.0'
Nick Mathewson [Tue, 28 Feb 2017 13:20:09 +0000 (08:20 -0500)] 
Merge branch 'maint-0.3.0'

8 years agoMerge branch 'bug21027_v2_squashed' into maint-0.3.0
Nick Mathewson [Tue, 28 Feb 2017 13:16:43 +0000 (08:16 -0500)] 
Merge branch 'bug21027_v2_squashed' into maint-0.3.0

8 years agoChange approach to preventing duplicate guards.
Nick Mathewson [Tue, 14 Feb 2017 17:21:31 +0000 (12:21 -0500)] 
Change approach to preventing duplicate guards.

Previously I'd made a bad assumption in the implementation of
prop271 in 0.3.0.1-alpha: I'd assumed that there couldn't be two
guards with the same identity.  That's true for non-bridges, but in
the bridge case, we allow two bridges to have the same ID if they
have different addr:port combinations -- in order to have the same
bridge ID running multiple PTs.

Fortunately, this assumption wasn't deeply ingrained: we stop
enforcing the "one guard per ID" rule in the bridge case, and
instead enforce "one guard per <id,addr,port>".

We also needed to tweak our implementation of
get_bridge_info_for_guard, since it made the same incorrect
assumption.

Fixes bug 21027; bugfix on 0.3.0.1-alpha.

8 years agoMerge branch 'disable_memory_sentinels_squashed'
Nick Mathewson [Mon, 27 Feb 2017 21:25:25 +0000 (16:25 -0500)] 
Merge branch 'disable_memory_sentinels_squashed'

8 years agoCode to disable memory sentinels for fuzzing
Nick Mathewson [Mon, 13 Feb 2017 14:10:11 +0000 (09:10 -0500)] 
Code to disable memory sentinels for fuzzing

This feature makes it possible to turn off memory sentinels (like
those used for safety in buffers.c and memarea.c) when fuzzing, so
that we can catch bugs that they would otherwise prevent.

8 years agoMerge branch 'maint-0.3.0'
Nick Mathewson [Mon, 27 Feb 2017 16:36:56 +0000 (11:36 -0500)] 
Merge branch 'maint-0.3.0'

8 years agoMerge remote-tracking branch 'teor/feature21570-030' into maint-0.3.0
Nick Mathewson [Mon, 27 Feb 2017 16:36:39 +0000 (11:36 -0500)] 
Merge remote-tracking branch 'teor/feature21570-030' into maint-0.3.0

8 years agoMerge branch 'maint-0.3.0'
Nick Mathewson [Mon, 27 Feb 2017 16:25:46 +0000 (11:25 -0500)] 
Merge branch 'maint-0.3.0'

8 years agoMerge branch 'bug21369_check_029_squashed' into maint-0.3.0
Nick Mathewson [Mon, 27 Feb 2017 16:25:34 +0000 (11:25 -0500)] 
Merge branch 'bug21369_check_029_squashed' into maint-0.3.0

8 years agoMerge branch 'maint-0.3.0'
Nick Mathewson [Mon, 27 Feb 2017 16:23:02 +0000 (11:23 -0500)] 
Merge branch 'maint-0.3.0'

8 years agoMerge branch 'bug21420_029_squashed' into maint-0.3.0
Nick Mathewson [Mon, 27 Feb 2017 16:20:39 +0000 (11:20 -0500)] 
Merge branch 'bug21420_029_squashed' into maint-0.3.0

8 years agoRevise the logic for picking the start time for link certs
Nick Mathewson [Mon, 13 Feb 2017 20:37:41 +0000 (15:37 -0500)] 
Revise the logic for picking the start time for link certs

Since 0.2.4.11-alpha (in 0196647970a91d) we've tried to randomize
the start time to up to some time in the past.  But unfortunately we
allowed the start time to be in the future as well, which isn't
really legit.

The new behavior lets the start time be be up to
MAX(cert_lifetime-2days, 0) in the past, but never in the future.

Fixes bug 21420; bugfix on 0.2.4.11-alpha.

8 years agoMerge branch 'maint-0.3.0'
Nick Mathewson [Mon, 27 Feb 2017 16:03:25 +0000 (11:03 -0500)] 
Merge branch 'maint-0.3.0'

8 years agoMerge remote-tracking branch 'teor/bug20711' into maint-0.3.0
Nick Mathewson [Mon, 27 Feb 2017 16:00:02 +0000 (11:00 -0500)] 
Merge remote-tracking branch 'teor/bug20711' into maint-0.3.0

8 years agoFix a wide line
Nick Mathewson [Mon, 27 Feb 2017 15:58:26 +0000 (10:58 -0500)] 
Fix a wide line

8 years agoFix a "directive within macro arguments" warning
Nick Mathewson [Mon, 27 Feb 2017 15:58:19 +0000 (10:58 -0500)] 
Fix a "directive within macro arguments" warning

8 years agoMerge remote-tracking branch 'ahf/bugs/21206'
Nick Mathewson [Mon, 27 Feb 2017 15:53:12 +0000 (10:53 -0500)] 
Merge remote-tracking branch 'ahf/bugs/21206'