sarah
/
tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
19,075 Commits 31 Branches 486 Tags 66 MiB
Commit Graph

19075 Commits

Author SHA1 Message Date
Nick Mathewson d9dd67e216 Merge branch 'maint-0.2.5' into release-0.2.5 2017-06-08 09:29:49 -04:00
Nick Mathewson 77c5d8c738 Merge branch 'maint-0.2.4' into maint-0.2.5 
"ours" merge to avoid version bump.
 2017-06-08 09:28:11 -04:00
Nick Mathewson fa73f59ad3 bump to 0.2.5.14 2017-06-08 09:26:00 -04:00
Nick Mathewson 8e439a66f3 Bump to 0.2.4.29 2017-06-08 09:25:31 -04:00
Nick Mathewson 0a78d2947c Merge branch 'maint-0.2.5' into release-0.2.5 2017-06-08 09:21:15 -04:00
Nick Mathewson dec7998f5c Merge branch 'maint-0.2.4' into maint-0.2.5 2017-06-08 09:21:15 -04:00
David Goulet 56a7c5bc15 TROVE-2017-005: Fix assertion failure in connection_edge_process_relay_cell 
On an hidden service rendezvous circuit, a BEGIN_DIR could be sent
(maliciously) which would trigger a tor_assert() because
connection_edge_process_relay_cell() thought that the circuit is an
or_circuit_t but is an origin circuit in reality.

Fixes #22494

Reported-by: Roger Dingledine <arma@torproject.org>
Signed-off-by: David Goulet <dgoulet@torproject.org>
 2017-06-08 09:21:10 -04:00
Nick Mathewson 020c003a63 Merge branch 'maint-0.2.5' into release-0.2.5 2017-06-05 14:39:00 -04:00
Nick Mathewson 2e5220cb8b Merge branch 'maint-0.2.4' into maint-0.2.5 2017-06-05 14:38:54 -04:00
Nick Mathewson 4ee48cb434 Fix C89 warning (since Tor 0.2.4-5 still care about that.) 2017-06-05 14:38:38 -04:00
Nick Mathewson b104ea724d Merge branch 'maint-0.2.5' into release-0.2.5 2017-06-05 12:00:14 -04:00
Nick Mathewson 1a540b5792 Merge branch 'maint-0.2.4' into maint-0.2.5 2017-06-05 12:00:08 -04:00
Nick Mathewson e3ebae4804 Fix undefined behavior in geoip_parse_entry(). 
Fixes bug 22490; bugfix on 6a241ff3ff in 0.2.4.6-alpha.

Found by teor using clang-5.0's AddressSanitizer stack-use-after-scope.
 2017-06-05 10:09:39 -04:00
Nick Mathewson 33b69e6884 Merge branch 'maint-0.2.5' into release-0.2.5 2017-05-08 08:08:01 -04:00
Nick Mathewson 68d6720452 Merge branch 'maint-0.2.4' into maint-0.2.5 2017-05-08 08:06:59 -04:00
Karsten Loesing 5207e41ffe Update geoip and geoip6 to the May 2 2017 database. 2017-05-08 10:09:42 +02:00
Nick Mathewson 148d76c092 Merge branch 'maint-0.2.5' into release-0.2.5 2017-04-06 08:32:36 -04:00
Nick Mathewson a8a860e1da Merge branch 'maint-0.2.4' into maint-0.2.5 2017-04-06 08:31:12 -04:00
Karsten Loesing 9d7933296c Update geoip and geoip6 to the April 4 2017 database. 2017-04-06 10:52:39 +02:00
Nick Mathewson 51ca3dc811 Merge branch 'maint-0.2.5' into release-0.2.5 2017-03-08 10:10:36 -05:00
Nick Mathewson 933a1e7997 Merge branch 'maint-0.2.4' into maint-0.2.5 2017-03-08 10:10:29 -05:00
Karsten Loesing 4488c319dd Update geoip and geoip6 to the March 7 2017 database. 2017-03-08 09:41:35 +01:00
Nick Mathewson 45245fe29e Pick a date, update ReleaseNotes. (0.2.5) 2017-03-03 14:56:01 -05:00
Nick Mathewson 5c5298e4ff Merge branch 'maint-0.2.5' into release-0.2.5 2017-02-28 10:25:24 -05:00
Nick Mathewson 884b3717a9 Bump version to 0.2.5.13 2017-02-28 10:23:20 -05:00
Nick Mathewson b2b604ecb4 Merge branch 'maint-0.2.4' into maint-0.2.5 
"ours" merge to avoid bumping version
 2017-02-28 10:22:36 -05:00
Nick Mathewson 4bab288a82 Bump to 0.2.4.28 2017-02-28 10:20:46 -05:00
Nick Mathewson 30844dd51a Sort changelog in release-0.2.5 2017-02-28 10:11:38 -05:00
Nick Mathewson 8e0bf7fac1 Adjust 0.2.5.13 changelog entry from 0.3.0.4-rc to match 2017-02-28 10:05:50 -05:00
Nick Mathewson b909aed534 Fix 025 EOL date 2017-02-23 16:48:15 -05:00
Nick Mathewson 7b1762481b Begin an 0.2.5.13 changelog 
To build this changelog, I've gone through the entries in
release-0.2.5's changes subdirectory, and looked up the ChangeLog
entry for each.  I have not sorted them yet.
 2017-02-23 15:50:27 -05:00
Nick Mathewson a8a1e7e8da Merge branch 'maint-0.2.5' into release-0.2.5 2017-02-15 07:53:05 -05:00
Nick Mathewson aeb299ba6d Merge branch 'maint-0.2.5' of git-rw.torproject.org:/tor into maint-0.2.5 2017-02-15 07:51:33 -05:00
Nick Mathewson c0ff59f870 Merge branch 'maint-0.2.5' into release-0.2.5 2017-02-15 07:50:48 -05:00
Nick Mathewson a452b71395 Merge branch 'maint-0.2.4' into maint-0.2.5 2017-02-15 07:47:04 -05:00
Nick Mathewson 194e31057f Avoid integer underflow in tor_version_compare. 
Fix for TROVE-2017-001 and bug 21278.

(Note: Instead of handling signed ints "correctly", we keep the old
behavior, except for the part where we would crash with -ftrapv.)
 2017-02-14 16:10:27 -05:00
Roger Dingledine 144ec3d58c Merge branch 'maint-0.2.4' into maint-0.2.5 2017-02-13 15:23:50 -05:00
Roger Dingledine 635c5a8a92 be sure to remember the changes file for #20384 2017-02-13 15:22:36 -05:00
Nick Mathewson c0257f14cd Merge branch 'maint-0.2.5' into release-0.2.5 2017-02-13 14:39:13 -05:00
Nick Mathewson 124062e843 Merge branch 'maint-0.2.4' into maint-0.2.5 2017-02-13 14:37:01 -05:00
Karsten Loesing f6016058b4 Update geoip and geoip6 to the February 8 2017 database. 2017-02-12 15:56:31 +01:00
Nick Mathewson 2f6a66a174 Merge branch 'maint-0.2.5' into release-0.2.5 2017-02-07 10:39:50 -05:00
Nick Mathewson 2ce4330249 Merge remote-tracking branch 'public/bug18710_025' into maint-0.2.5 2017-02-07 10:37:43 -05:00
Nick Mathewson c056d19323 Merge branch 'maint-0.2.4' into maint-0.2.5 2017-02-07 10:37:31 -05:00
Nick Mathewson 85a2487f97 Disable a log_backtrace (which 0.2.4 does not have) in 16248 fix 2017-02-07 09:49:23 -05:00
Nick Mathewson cfeb1db2fb Add comments to connection_check_event(). 2017-02-07 09:48:24 -05:00
Nick Mathewson 457d38a6e9 Change behavior on missing/present event to warn instead of asserting. 
Add a changes file.
 2017-02-07 09:48:19 -05:00
Nick Mathewson 650c03127a If we start/stop reading on a dnsserv connection, don't assert. 
Fixes bug 16248. Patch from cypherpunks.  Bugfix on 0.2.0.1-alpha.
 2017-02-07 09:48:13 -05:00
Nick Mathewson 72d9e057c3 Merge branch 'maint-0.2.5' into release-0.2.5 2017-02-07 09:21:13 -05:00
Nick Mathewson b9ef21cf56 Merge branch 'maint-0.2.4' into maint-0.2.5 2017-02-07 09:17:59 -05:00