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
16,950 Commits 53 Branches 631 Tags
3dfd1ebf12671323e97b002f66484544d90f1bae
Commit Graph

2168 Commits

Author SHA1 Message Date
Nick Mathewson 3dfd1ebf12 Merge remote-tracking branch 'origin/maint-0.2.4' 2013-04-11 01:40:31 -04:00
Nick Mathewson 7f50af116f Merge remote-tracking branch 'public/bug8117_023' into maint-0.2.4 
Conflicts:
	doc/tor.1.txt
	src/or/config.c
	src/or/connection.c
 2013-04-11 01:39:55 -04:00
Nick Mathewson 1bbfadfa61 Merge remote-tracking branch 'origin/maint-0.2.4' 2013-04-08 11:10:07 -04:00
Nick Mathewson 6acf0ac285 Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 2013-04-08 11:09:50 -04:00
Nick Mathewson 9630fb917f Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3 2013-04-08 11:09:26 -04:00
Karsten Loesing b41f03f6df Update to the April 2013 GeoIP database. 2013-04-08 12:18:40 +02:00
Nick Mathewson 25f9ecf4b2 Merge remote-tracking branch 'origin/maint-0.2.4' 2013-04-05 16:58:26 -04:00
Nick Mathewson 3367a7611e Merge remote-tracking branch 'desoxy/bug-8596' into maint-0.2.4 2013-04-05 16:57:53 -04:00
Nick Mathewson 55817c4c50 Merge remote-tracking branch 'origin/maint-0.2.4' 2013-04-05 16:53:07 -04:00
Peter Palfrader d1dc23c938 test.c: Try to create a more random temporary directory for our workspace (re: Bug#8638) 2013-04-05 16:51:48 -04:00
Desoxy 74f5e304e4 Controller: Add CACHED keyword to ADDRMAP events (#8596 part 2/2) 
Add keyword CACHED="YES"/"NO" to ADDRMAP control events to indicate whether the
DNS response will be cached or not.
 2013-04-03 18:50:51 +02:00
Nick Mathewson b349f09b47 Merge remote-tracking branch 'origin/maint-0.2.4' 2013-04-03 09:36:59 -04:00
Mike Perry 3207ace605 Changes file. 2013-04-03 09:32:21 -04:00
Nick Mathewson a934376049 Merge remote-tracking branch 'origin/maint-0.2.4' 2013-04-02 10:42:53 -04:00
Nick Mathewson 856d57531b Merge remote-tracking branch 'public/bug7707_diagnostic' into maint-0.2.4 2013-04-02 10:41:14 -04:00
Nick Mathewson 7ccaf3f1a4 Merge remote-tracking branch 'origin/maint-0.2.4' 2013-04-02 10:37:00 -04:00
Nick Mathewson 2c155064aa Merge remote-tracking branch 'public/bug8427' into maint-0.2.4 2013-04-02 10:36:15 -04:00
Nick Mathewson e755e146bd changes file for bug 6520 2013-04-01 21:52:24 -04:00
Nick Mathewson c1a2be9ffe Merge remote-tracking branch 'origin/maint-0.2.4' 2013-03-29 12:26:01 -04:00
Mike Perry 80d8fb23e3 Changes file for 8230, 8477 and 8419. 2013-03-29 12:21:28 -04:00
Nick Mathewson c3cc79ec38 Merge remote-tracking branch 'origin/maint-0.2.4' 2013-03-29 12:19:05 -04:00
Mike Perry 1d49ba84a8 Update the changes file for bug7799. 
Still not sure it's actually fixed yet...
 2013-03-29 12:17:05 -04:00
Mike Perry cc641ff5b0 Add changes file for bug 7799's log message changes. 
Note this does not close bug 7799.
 2013-03-29 12:17:04 -04:00
Nick Mathewson 097a08f6fe Merge remote-tracking branch 'origin/maint-0.2.4' 2013-03-28 09:33:58 -04:00
Nick Mathewson 96c0a42a92 Add a changes file for #8599 2013-03-28 09:33:24 -04:00
Nick Mathewson eb9b282cc2 Merge remote-tracking branch 'origin/maint-0.2.4' 2013-03-27 21:07:36 -04:00
Nick Mathewson 7f8098d2d0 Add some missing case values to please clang 
It seems that some versions of clang that would prefer the
-Wswitch-enum compiler flag to warn about switch statements with
missing enum values, even if those switch statements have a
default.

Fixes bug 8598; bugfix on 0.2.4.10-alpha.
 2013-03-27 21:04:08 -04:00
Mike Perry fc9a72c688 Changes file for bug6572. 2013-03-26 20:29:41 -07:00
Nick Mathewson e62b8051ee Merge remote-tracking branch 'origin/maint-0.2.4' 2013-03-26 22:20:33 -04:00
Mike Perry 4cc7cc28f8 Changes file for #7065 
(revised by nickm)
 2013-03-26 22:18:32 -04:00
Nick Mathewson fa3c237739 Per-SOCKSPort configuration for bug 8117 fix. 
This might be necessary if the bug8117 fix confuses any applications.

Also add a changes file.
 2013-03-20 16:17:06 -04:00
Nick Mathewson 7c2eabcf8e Merge remote-tracking branch 'origin/maint-0.2.4' 2013-03-20 14:47:49 -04:00
Nick Mathewson 3412054987 Merge remote-tracking branch 'public/bug8475_023' into maint-0.2.4 2013-03-20 14:47:13 -04:00
Nick Mathewson a87f22ef64 Merge remote-tracking branch 'origin/maint-0.2.4' 2013-03-20 14:26:22 -04:00
Nick Mathewson a660fe6fd5 Let testing networks override ABSOLUTE_MIN_VALUE_FOR_FAST_FLAG 
This adds a new option to fix bug 8508 which broke chutney
networks. The bug was introduced by 317d16de.
 2013-03-20 13:34:57 -04:00
Nick Mathewson 63a42b38b1 Merge remote-tracking branch 'public/unsigned-time_t' 2013-03-20 10:53:07 -04:00
Nick Mathewson 66d52b876a Merge remote-tracking branch 'origin/maint-0.2.4' 2013-03-20 10:52:49 -04:00
Nick Mathewson 90d2162f32 Merge commit '2f98bf5c9fac4dfd1bb07564ce08b13d1e330252' into maint-0.2.4 
(This is the part of the Bug 8042 patch that warns about unsigned time_t)
 2013-03-20 10:52:26 -04:00
Nick Mathewson 80c987fbb4 Merge remote-tracking branch 'origin/maint-0.2.4' 2013-03-20 10:34:31 -04:00
Nick Mathewson 5b0b51ca3f Merge remote-tracking branch 'public/bug6304_v3' into maint-0.2.4 
Conflicts:
	src/or/circuitbuild.c
	src/or/config.c
 2013-03-20 10:31:56 -04:00
Nick Mathewson 96d39fd236 Merge remote-tracking branch 'origin/maint-0.2.4' 2013-03-19 16:44:00 -04:00
Nick Mathewson ca50fb4f81 Don't assert when writing a cell to a CLOSING connection. 
Instead, drop the cell.

Fixes another case of bug 7350; bugfix on 0.2.4.4-alpha
 2013-03-19 16:35:40 -04:00
Nick Mathewson 96e8e30ee3 Merge remote-tracking branch 'origin/maint-0.2.4' 2013-03-19 16:17:42 -04:00
Nick Mathewson 323cb655be Merge remote-tracking branch 'public/bug7164_diagnostic' into maint-0.2.4 2013-03-19 16:16:48 -04:00
Nick Mathewson c547502ecb Merge remote-tracking branch 'origin/maint-0.2.4' 2013-03-19 16:15:39 -04:00
Nick Mathewson 6f20a74d52 Merge branch 'bug8240_v2_squashed' into maint-0.2.4 
Conflicts:
	doc/tor.1.txt
	src/or/circuitbuild.c
	src/or/config.c
	src/or/or.h
 2013-03-19 16:15:27 -04:00
Nick Mathewson 343f7aa059 Make the guard lifetime configurable and adjustable via the consensus 
Fixes 8240.

(Don't actually increase the default guard lifetime. It seems likely to
break too many things if done precipitiously.)
 2013-03-19 16:02:19 -04:00
Nick Mathewson acbfc9c8cc Merge remote-tracking branch 'origin/maint-0.2.4' 2013-03-19 15:32:44 -04:00
Nick Mathewson a7b46336eb Merge remote-tracking branch 'public/bug7950' into maint-0.2.4 2013-03-19 15:32:17 -04:00
Nick Mathewson 60fd08f40b Merge remote-tracking branch 'origin/maint-0.2.4' 2013-03-19 15:13:07 -04:00