nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-15 07:43:31 +01:00
Code Issues Packages Projects Releases Wiki Activity
28,620 Commits 53 Branches 630 Tags 125 MiB
fcfa22d80a
Commit Graph

28620 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nick Mathewson
38b7885c90 Merge branch 'maint-0.3.1' into maint-0.3.2 2018-03-13 10:58:03 -04:00
Nick Mathewson
0e7f15fdb6 Merge branch 'maint-0.2.9' into maint-0.3.1 2018-03-13 10:58:02 -04:00
Nick Mathewson
67a313f0ec Merge branch 'maint-0.2.5' into maint-0.2.9 2018-03-13 10:58:02 -04:00
Karsten Loesing
3418a3a7f0 Update geoip and geoip6 to the March 8 2018 database. 2018-03-13 10:57:49 -04:00
Nick Mathewson
1047ef140e Merge branch 'maint-0.3.3' 2018-03-13 13:41:33 +01:00
Nick Mathewson
676a28599d Merge branch 'maint-0.3.2' into maint-0.3.3 2018-03-13 13:41:24 +01:00
Nick Mathewson
094294dbb1 Merge branch 'bug25474_032' into maint-0.3.2 2018-03-13 13:41:11 +01:00
Nick Mathewson
53a807e1e9 Add a missing prototype to our libevent configure stanza. 
Fixes bug 25474; bugfix on 0.3.2.5-alpha.
 2018-03-13 13:37:26 +01:00
Nick Mathewson
40154c1f9e Merge branch 'maint-0.3.3' 2018-03-13 10:00:58 +01:00
Nick Mathewson
e9dbd6dd8f Update the documentation in tor_api.h 2018-03-13 10:00:41 +01:00
Isis Lovecruft
9191d962f9
changes: Fix changes file for bug25450. 
It didn't like me insulting my patch, I guess.
 2018-03-08 20:50:57 +00:00
Isis Lovecruft
0545f64d24
test: Increase time limit for IP creation in an HS test. 
This should avoid most intermittent test failures on developer and CI machines,
but there could (and probably should) be a more elegant solution.

Also, this test was testing that the IP was created and its expiration time was
set to a time greater than or equal to `now+INTRO_POINT_LIFETIME_MIN_SECONDS+5`:

    /* Time to expire MUST also be in that range. We add 5 seconds because
     * there could be a gap between setting now and the time taken in
     * service_intro_point_new. On ARM, it can be surprisingly slow... */
    tt_u64_op(ip->time_to_expire, OP_GE,
              now + INTRO_POINT_LIFETIME_MIN_SECONDS + 5);

However, this appears to be a typo, since, according to the comment above it,
adding five seconds was done because the IP creation can be slow on some
systems.  But the five seconds is added to the *minimum* time we're comparing
against, and so it actually functions to make this test *more* likely to fail on
slower systems.  (It should either subtract five seconds, or instead add it to
time_to_expire.)

 * FIXES #25450: https://bugs.torproject.org/25450
 2018-03-08 20:50:50 +00:00
Fernando Fernandez Mancera
c1cfa0fbc4 Tweaks into AccountingStart documentation. 
Signed-off-by: Fernando Fernandez Mancera <ffmancera@riseup.net>
 2018-03-08 12:28:34 +01:00
Caio Valente
8775c93a99 Refactor: suppress duplicated functions from router.c and encapsulate NODE_DESC_BUF_LEN constant. 
Also encapsulates format_node_description().

Closes ticket 25432.
 2018-03-06 20:42:32 +01:00
Deepesh Pathak
930b985581
Fix redundant authority certificate fetch 
- Fixes #24740
- Fetch certificates only in those cases when consensus are waiting for certs.
 2018-03-04 21:13:58 +05:30
Nick Mathewson
699bb803ba Fix a crash bug when testing reachability 
Fixes bug 25415; bugfix on 0.3.3.2-alpha.
 2018-03-04 10:31:17 -05:00
Nick Mathewson
e5a990fc5a tweak changelog for 4187 2018-03-03 12:02:45 -05:00
Nick Mathewson
df9d2de441 Merge remote-tracking branch 'fristonio/ticket4187' 2018-03-03 12:02:30 -05:00
Nick Mathewson
338dbdab93 Merge branch 'maint-0.3.3' 2018-03-03 11:59:27 -05:00
Nick Mathewson
ccf0f77da1 changes file for 25378 2018-03-03 11:58:22 -05:00
Alexander Færøy
59a7b00384 Update tor.1.txt with the currently available log domains. 
See: https://bugs.torproject.org/25378
 2018-03-03 11:58:14 -05:00
Nick Mathewson
62482ea279 Merge branch 'maint-0.3.3' 2018-03-03 11:53:05 -05:00
Nick Mathewson
cc7de9ce1d Merge branch 'ticket23814' into maint-0.3.3 2018-03-03 11:53:01 -05:00
Nick Mathewson
27c3a1d657 Merge branch 'maint-0.3.3' 
"ours" merge to avoid version bump.
 2018-03-03 11:34:02 -05:00
Nick Mathewson
aec505a310 bump to 0.3.3.3-alpha-dev 2018-03-03 11:33:56 -05:00
Nick Mathewson
35d945a646 Merge branch 'maint-0.3.2' into maint-0.3.3 
"ours" merge to avoid version bump.
 2018-03-03 11:33:33 -05:00
Nick Mathewson
0026d1a673 bump version to 0.3.2.10-dev 2018-03-03 11:33:27 -05:00
Nick Mathewson
d81a5231ee Merge branch 'maint-0.3.1' into maint-0.3.2 
"ours" merge to avoid version bump
 2018-03-03 11:33:02 -05:00
Nick Mathewson
0aa794d309 version bump to 0.3.1.10-dev 2018-03-03 11:32:51 -05:00
Nick Mathewson
2e2aacca2a Merge branch 'maint-0.2.9' into maint-0.3.1 
"ours" merge to avoid version bump.
 2018-03-03 11:32:29 -05:00
Nick Mathewson
9eb6f9d3c8 Bump version to 0.2.9.15-dev 2018-03-03 11:32:16 -05:00
Nick Mathewson
9a14f1ef64 Copy changelog and releasenotes entries from today's releases. 2018-03-03 07:58:12 -05:00
Nick Mathewson
9f35dd9e8a Merge branch 'master' of git-rw.torproject.org:/tor 2018-03-03 07:57:30 -05:00
Roger Dingledine
2bd23cebf3 resolve a weird binary character that crept into the man page 2018-03-02 19:21:45 -05:00
Roger Dingledine
b46bda9d18 get rid of extraneous punctuation in man page 2018-03-02 19:07:04 -05:00
Roger Dingledine
6db6a00671 fix a confusing "0 0" in the man page 
feel free to backport this commit back to 0.3.2.x if you like it
 2018-03-02 18:58:29 -05:00
Alex Xu (Hello71)
45d3b5fa4c Remove uncompilable tor_mmap_file fallback. #25398 2018-03-02 09:51:53 -05:00
Nick Mathewson
6f1fe29e8d Merge branch 'maint-0.3.3' 
"ours" to avoid version bump.
 2018-03-01 16:44:18 -05:00
Nick Mathewson
15f6201a5b increment to 0.3.3.3-alpha 2018-03-01 16:44:07 -05:00
Nick Mathewson
e0903ebd88 Merge branch 'maint-0.3.2' into maint-0.3.3 
"ours" to avoid version bump.
 2018-03-01 16:43:42 -05:00
Nick Mathewson
1ec386561e version bump to 0.3.2.10 2018-03-01 16:43:35 -05:00
Nick Mathewson
5b0ae08400 Merge branch 'maint-0.3.1' into maint-0.3.2 
"ours" to avoid version bump.
 2018-03-01 16:43:10 -05:00
Nick Mathewson
c527a8a9c9 Update to 0.3.1.10 2018-03-01 16:43:01 -05:00
Nick Mathewson
805a785780 Merge branch 'maint-0.2.9' into maint-0.3.1 
"ours" merge to avoid version bump.
 2018-03-01 16:42:25 -05:00
Nick Mathewson
35753c0774 version bump to 0.2.9.15 2018-03-01 16:42:17 -05:00
Nick Mathewson
d22963938f Merge branch 'maint-0.3.3' 2018-03-01 16:10:47 -05:00
Nick Mathewson
f7eff2f8c5 Merge branch 'maint-0.3.2' into maint-0.3.3 2018-03-01 16:10:43 -05:00
Nick Mathewson
d01abb9346 Merge branch 'maint-0.3.1' into maint-0.3.2 2018-03-01 16:07:59 -05:00
Nick Mathewson
d4a758e083 Merge branch 'maint-0.2.9' into maint-0.3.1 2018-03-01 16:07:59 -05:00
Nick Mathewson
c1bb8836ff Protover tests: disable some obsoleted tests 
These were meant to demonstrate old behavior, or old rust behavior.

One of them _should_ work in Rust, but won't because of
implementation details.  We'll fix that up later.
 2018-03-01 16:05:17 -05:00