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
27,209 Commits 53 Branches 631 Tags
955a7f52d36e99a96df5e54a2a88dcc2b9931f62
Commit Graph
27209 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Nick Mathewson 955a7f52d3 Merge branch 'maint-0.3.2' into release-0.3.2 2018-04-05 08:36:13 -04:00
Nick Mathewson df519e5de8 Merge branch 'maint-0.3.1' into maint-0.3.2 2018-04-05 08:36:13 -04:00
Taylor Yu e813116d3d Switch Travis to stable rust 2018-04-05 08:36:09 -04:00
Nick Mathewson 70bd4aae67 Merge branch 'maint-0.3.2' into release-0.3.2 2018-04-05 08:22:34 -04:00
Nick Mathewson 9b10eb2d7a Merge branch 'maint-0.3.1' into maint-0.3.2 2018-04-05 08:22:34 -04:00
Nick Mathewson 834eef2452 Merge branch 'maint-0.2.9' into maint-0.3.1 2018-04-05 08:22:34 -04:00
Nick Mathewson b68e636b33 Merge branch 'maint-0.2.5' into maint-0.2.9 2018-04-05 08:22:33 -04:00
Karsten Loesing 1fa396b0a4 Update geoip and geoip6 to the April 3 2018 database. 2018-04-05 10:42:25 +02:00
Nick Mathewson 6170f87e01 Merge branch 'maint-0.3.2' into release-0.3.2 2018-03-27 18:25:21 -04:00
Nick Mathewson 0b795ce6de Merge remote-tracking branch 'catalyst-github/bug25629-032' into maint-0.3.2 2018-03-27 18:24:59 -04:00
Nick Mathewson 5e7d505850 Merge branch 'maint-0.3.1' into maint-0.3.2 
"ours" merge to avoid earlier version of 25629 fix.
 2018-03-27 18:24:37 -04:00
Nick Mathewson 5acfc30876 Merge branch 'maint-0.2.9' into maint-0.3.1 2018-03-27 18:23:53 -04:00
Taylor Yu 0c13a84c0d Fix CID 1430932 
Coverity found a null pointer reference in nodelist_add_microdesc().
This is almost certainly impossible assuming that the routerstatus_t
returned by router_get_consensus_status_by_descriptor_digest() always
corresponds to an entry in the nodelist.  Fixes bug 25629.
 2018-03-27 16:08:39 -05:00
Taylor Yu 4bb7d9fd12 Fix CID 1430932 
Coverity found a null pointer reference in nodelist_add_microdesc().
This is almost certainly impossible assuming that the routerstatus_t
returned by router_get_consensus_status_by_descriptor_digest() always
corresponds to an entry in the nodelist.  Fixes bug 25629.
 2018-03-27 15:29:00 -05:00
Nick Mathewson 7dbaaba3d2 Merge branch 'maint-0.3.2' into release-0.3.2 2018-03-26 10:29:29 -04:00
Nick Mathewson b5a6c03998 Merge branch 'maint-0.3.1' into maint-0.3.2 2018-03-26 10:29:29 -04:00
Nick Mathewson 068d092749 Merge branch 'maint-0.2.9' into maint-0.3.1 2018-03-26 10:29:29 -04:00
Nick Mathewson 9f93bcd16d Remove sb_poll check: all poll() calls are ok. 2018-03-20 08:30:21 -04:00
Nick Mathewson 070eda5a21 Add the poll() syscall as permitted by the sandbox 
Apparently, sometimes getpwnam will call this.

Fixes bug 25513.
 2018-03-20 08:23:44 -04:00
Nick Mathewson 109c555e9d Merge branch 'maint-0.3.2' into release-0.3.2 2018-03-19 16:59:49 -04:00
Isis Lovecruft 66d3120634 tests: Fix HS test against max IP lifetime. 
* FIXES part of #25450: https://bugs.torproject.org/25450
 2018-03-19 16:59:07 -04:00
Nick Mathewson 1aa0ae2cc3 Merge branch 'maint-0.2.9' into maint-0.3.1 2018-03-19 05:42:43 -04:00
Nick Mathewson 3370b3cfef Merge branch 'maint-0.2.5' into maint-0.2.9 2018-03-19 05:42:43 -04:00
Nick Mathewson 36154c13f4 Merge branch 'maint-0.3.2' into release-0.3.2 2018-03-19 05:42:43 -04:00
Nick Mathewson bc0de600b2 Merge branch 'maint-0.3.1' into maint-0.3.2 2018-03-19 05:42:43 -04:00
Nick Mathewson 0eb2cdf99d Merge remote-tracking branch 'catalyst-github/bug25388-025' into maint-0.2.5 2018-03-19 05:42:38 -04:00
Nick Mathewson 75b544d64d Merge branch 'maint-0.3.2' into release-0.3.2 2018-03-19 05:36:06 -04:00
Nick Mathewson a0cc7e9492 Merge remote-tracking branch 'isis/bug25450_032' into maint-0.3.2 2018-03-19 05:35:39 -04:00
Nick Mathewson 2f397236b2 Merge branch 'maint-0.3.2' into release-0.3.2 2018-03-13 10:59:30 -04:00
Nick Mathewson d60dc27555 Merge branch 'maint-0.3.1' into maint-0.3.2 2018-03-13 10:59:30 -04:00
Nick Mathewson 4b067f8b12 Merge branch 'maint-0.3.2' into release-0.3.2 2018-03-13 10:58:03 -04:00
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 4a03851e42 Merge branch 'maint-0.3.2' into release-0.3.2 2018-03-13 13:42:06 +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
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
Nick Mathewson 2d42648eaf Merge branch 'maint-0.3.2' into release-0.3.2 2018-03-03 11:34:10 -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 31cc63deb6 copy changelog into release notes tor-0.3.2.10 2018-03-03 07:58:00 -05:00
Nick Mathewson 8231cc868e final (?) changelog tweaks 2018-03-03 07:48:49 -05:00
Nick Mathewson a9769b78f0 Merge branch 'maint-0.3.2' into release-0.3.2 2018-03-01 16:44:31 -05:00
Nick Mathewson 1ec386561e version bump to 0.3.2.10 2018-03-01 16:43:35 -05:00