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
18,834 Commits 53 Branches 631 Tags
c79976bc9b9bcf348eac5c30ffe2cfd2ad3023ab
Commit Graph
18834 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Nick Mathewson c79976bc9b Merge remote-tracking branch 'origin/maint-0.2.4' into release-0.2.5 2015-04-27 14:16:15 -04:00
Nick Mathewson efae1bcef6 Merge remote-tracking branch 'karsten/geoip6-apr2015' into maint-0.2.4 2015-04-27 14:15:58 -04:00
Nick Mathewson 609cdec112 Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 2015-04-27 14:15:44 -04:00
Karsten Loesing b5f6495876 Update geoip6 to the April 8 2015 database. 2015-04-24 17:51:36 +02:00
Karsten Loesing bcc0a48cfe Update geoip to the April 8 2015 database. 2015-04-24 17:49:45 +02:00
Nick Mathewson 99d0579ff5 changelog for 0.2.5.12 tor-0.2.5.12 2015-04-06 09:58:07 -04:00
Nick Mathewson c1237ed516 Merge branch 'maint-0.2.5' into release-0.2.5 2015-04-06 09:57:08 -04:00
Nick Mathewson 3a5d4d666e bump 0.2.5 version to 0.2.5.12 2015-04-06 09:56:37 -04:00
Nick Mathewson 5633261f2e Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5 2015-04-06 09:55:44 -04:00
Nick Mathewson 542100d3ca Bump 0.2.4 version more places 2015-04-06 09:48:53 -04:00
Nick Mathewson 442d577af5 Bump 0.2.4 version 2015-04-06 09:41:59 -04:00
Nick Mathewson 5a4caad88d Merge remote-tracking branch 'origin/maint-0.2.5' into release-0.2.5 2015-04-06 09:31:09 -04:00
Nick Mathewson fe69a7e1d7 Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5 2015-04-06 09:25:37 -04:00
Nick Mathewson 7451b4cafe Changes file for bug15601 2015-04-06 09:24:16 -04:00
Yawning Angel dc3cb00080 Handle empty/zero length encoded intro points more gracefully. 
In theory these should never the triggered as the only caller now
validates the parameters before this routine gets called.
 2015-04-06 09:21:43 -04:00
Yawning Angel 7b5f558da4 Treat empty introduction points sections as missing. 
Found by DonnchaC.
 2015-04-06 09:20:46 -04:00
Yawning Angel 49ddd92c11 Validate the RSA key size received when parsing INTRODUCE2 cells. 
Fixes bug 15600; reported by skruffy
 2015-04-06 09:18:17 -04:00
Nick Mathewson 53a605ee00 Merge branch 'maint-0.2.5' into release-0.2.5 2015-04-03 09:52:15 -04:00
Nick Mathewson 3781955f07 Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5 2015-04-03 09:38:54 -04:00
Nick Mathewson 01e4bc80cd Merge branch 'bug15515_024' into maint-0.2.4 2015-04-03 09:36:59 -04:00
George Kadianakis bcb839387e ... and if we do get multiple INTRODUCE1s on a circuit, kill the circuit 
(Sending a nak would be pointless.)

See ticket 15515 for discussion.
 2015-04-03 09:36:05 -04:00
George Kadianakis 8dba8a088d Block multiple introductions on the same intro circuit. 2015-04-03 09:35:47 -04:00
Nick Mathewson cfb61f909a forward-part 0.2.4 changelog; copy changelog into release notes tor-0.2.5.11 2015-03-17 09:40:44 -04:00
Nick Mathewson 4dcfc3ded6 Pick a release date; add a sentence. 2015-03-17 09:22:53 -04:00
Nick Mathewson 8ba0ea4419 Another entry for the 0.2.5.11 changelog 2015-03-12 12:53:06 -04:00
Nick Mathewson e573a51916 Merge branch 'maint-0.2.5' into release-0.2.5 2015-03-12 12:52:10 -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 eecd410984 Merge remote-tracking branch 'public/bug15205_025' into maint-0.2.5 2015-03-12 12:27:25 -04:00
Nick Mathewson 6bf06c5656 Merge branch 'maint-0.2.5' into release-0.2.5 
Conflicts:
	configure.ac
	contrib/win32build/tor-mingw.nsi.in
	src/win32/orconfig.h
 2015-03-12 10:53:21 -04:00
Nick Mathewson a00d07ac1b Bump 025 version to 0.2.5.11 2015-03-12 10:52:09 -04:00
Nick Mathewson b563082ad8 Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5 2015-03-12 10:51:08 -04:00
Nick Mathewson 5f46a59ba3 Bump 0.2.4 version. 2015-03-12 10:50:15 -04:00
Nick Mathewson 78d9af302e fold entries into changelog for 025 2015-03-12 10:46:18 -04:00
Nick Mathewson a286fbd711 Merge branch 'maint-0.2.5' into release-0.2.5 2015-03-09 16:24:54 -04:00
Nick Mathewson 306f2f0eff Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5 2015-03-09 16:24:44 -04:00
Nick Mathewson 220e9be095 Merge remote-tracking branch 'karsten/geoip6-mar2015' into maint-0.2.4 2015-03-09 16:24:07 -04:00
Nick Mathewson 5588e677bd Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 2015-03-09 16:23:55 -04:00
Karsten Loesing 62714068d9 Update geoip6 to the March 3 2015 database. 2015-03-09 21:11:52 +01:00
Karsten Loesing beda8d2934 Update geoip to the March 3 2015 database. 2015-03-09 21:09:44 +01:00
Nick Mathewson 2f962b9309 Copy changelog entries from the 0.2.6 changelog into the 0.2.5.11 changelog 2015-03-09 15:42:39 -04:00
Nick Mathewson 24c031b1a2 Don't use checked strl{cat,cpy} on OSX. 
There is a bug in the overlap-checking in strlcat that can crash Tor
servers.  Fixes bug 15205; this is an OSX bug, not a Tor bug.
 2015-03-09 15:09:49 -04:00
Nick Mathewson b0fff2a9c5 Merge remote-tracking branch 'origin/maint-0.2.5' into release-0.2.5 2015-03-09 13:36:57 -04:00
Nick Mathewson 64bfc2930a Restore c89 in 0.2.5 2015-03-09 13:22:58 -04:00
Nick Mathewson 448bd22092 Merge remote-tracking branch 'public/bug14261_025' into maint-0.2.5 2015-03-09 13:17:20 -04:00
Nick Mathewson 62631904cb GETINFO bw-event-cache to get information on recent BW events 
Closes 14128; useful to regain functionality lost because of 13988.
 2015-03-09 13:13:56 -04:00
Nick Mathewson e3408248b9 Merge remote-tracking branch 'public/bug13988_025' into maint-0.2.5 2015-03-09 13:12:54 -04:00
Nick Mathewson 410ce4cb49 Merge remote-tracking branch 'public/bug15088_025' into maint-0.2.5 2015-03-09 13:09:50 -04:00
Nick Mathewson 1a7419c3df Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5 2015-03-09 11:09:30 -04:00
Nick Mathewson 6704e18dd2 Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 2015-03-09 11:08:57 -04:00
Nick Mathewson addffcc14d Adjust changes header 2015-03-09 11:07:50 -04:00