Nick Mathewson
3033ba9f5e
When OOM, free cached hidden service descriptors too.
2015-01-12 13:47:52 -05:00
Nick Mathewson
f9ba0b76cd
Merge remote-tracking branch 'teor/bug13718-consensus-interval'
2014-12-23 14:25:37 -05:00
teor
8a8797f1e4
Fix If-Modified-Since in rapidly updating Tor networks
...
When V3AuthVotingInterval is low, decrease the delay on the
If-Modified-Since header passed to directory servers.
This allows us to obtain consensuses promptly when the consensus
interval is very short.
This assists in bootstrapping a testing Tor network.
Fixes bugs 13718 & 13963.
2014-12-24 06:13:32 +11:00
teor
1ee41b3eef
Allow consensus interval of 10 seconds when testing
...
Decrease minimum consensus interval to 10 seconds
when TestingTorNetwork is set. (Or 5 seconds for
the first consensus.)
Fix code that assumes larger interval values.
This assists in quickly bootstrapping a testing
Tor network.
Fixes bugs 13718 & 13823.
2014-12-24 06:13:32 +11:00
teor
083c58f126
Fix TestingMinExitFlagThreshold 0
...
Stop requiring exits to have non-zero bandwithcapacity in a
TestingTorNetwork. Instead, when TestingMinExitFlagThreshold is 0,
ignore exit bandwidthcapacity.
This assists in bootstrapping a testing Tor network.
Fixes bugs 13718 & 13839.
Makes bug 13161's TestingDirAuthVoteExit non-essential.
2014-12-24 06:13:32 +11:00
Nick Mathewson
d7776315df
Merge remote-tracking branch 'public/bug13811_025'
2014-12-23 13:02:37 -05:00
Nick Mathewson
c10ff26265
Changes file for 13811
2014-12-23 13:00:21 -05:00
Nick Mathewson
7e1289b3ec
changes file for ticket11016
2014-12-23 11:32:10 -05:00
Nick Mathewson
c6ac752353
Merge remote-tracking branch 'origin/maint-0.2.5'
2014-12-23 11:00:02 -05:00
Nick Mathewson
dfebefe68f
changs file for 13808
2014-12-23 10:59:48 -05:00
Nick Mathewson
184a2dbbdd
whoops; missing changes file for 14013
2014-12-23 10:55:25 -05:00
Nick Mathewson
f645564778
Start on a changelog for 0.2.6.2-alpha
2014-12-22 10:02:18 -05:00
Nick Mathewson
845d92295f
have lintchanges check header format.
2014-12-22 10:00:34 -05:00
Nick Mathewson
441a481bb8
Resolve issues in changes files
2014-12-22 09:49:33 -05:00
Nick Mathewson
1c05dfd0b6
Merge branch 'ticket7356_squashed'
2014-12-21 14:48:53 -05:00
rl1987
ed0b46e711
Changes file for 7356
2014-12-21 14:48:39 -05:00
Nick Mathewson
647a90b9b3
Merge remote-tracking branch 'teor/bug14002-osx-transproxy-ipfw-pf'
2014-12-21 13:37:40 -05:00
teor
6fad395300
Fix clang warning, IPv6 address comment, buffer size typo
...
The address of an array in the middle of a structure will
always be non-NULL. clang recognises this and complains.
Disable the tautologous and redundant check to silence
this warning.
Fixes bug 14001.
2014-12-21 13:35:03 -05:00
teor
d93516c445
Fix transparent proxy checks to allow OS X to use ipfw or pf
...
OS X uses ipfw (FreeBSD) or pf (OpenBSD). Update the transparent
proxy option checks to allow for both ipfw and pf on OS X.
Fixes bug 14002.
2014-12-20 22:28:58 +11:00
Nick Mathewson
64787e99fa
Merge branch 'asn-karsten-task-13192-5-squashed'
2014-12-19 10:35:47 -05:00
George Kadianakis
13a6fb9a2a
HS stats: Add changes file and improve man page.
2014-12-19 10:35:34 -05:00
Nick Mathewson
eee248bc59
Merge remote-tracking branch 'dgoulet/bug13936_025_v2'
2014-12-19 09:38:46 -05:00
David Goulet
3d83907ab1
Fix: call circuit_has_opened() for rendezvous circuit
...
In circuit_get_open_circ_or_launch(), for a rendezvous circuit,
rend_client_rendcirc_has_opened() but circuit_has_opened() is preferred here
since it will call the right function for a specific circuit purpose.
Furthermore, a controller event is triggered where the former did not.
Signed-off-by: David Goulet <dgoulet@ev0ke.net>
2014-12-17 16:06:53 -05:00
Nick Mathewson
7d5916c0a7
Reference bug number in changes file
2014-12-12 08:53:42 -05:00
Nick Mathewson
915c9a517e
Merge remote-tracking branch 'meejah/ticket-13941-b'
2014-12-12 08:53:14 -05:00
Nick Mathewson
7c5d888977
Tweak 13942 fix
2014-12-12 08:49:52 -05:00
meejah
85bfad1875
Pre-check hidden-service-dir permissions/ownership
...
See ticket #13942 where Tor dies if you feed it a hidden service
directory with the wrong owner via SETCONF.
2014-12-11 18:46:56 -07:00
meejah
76753efd7b
Fix 13941: make calling log_new_relay_greeting() optional.
...
Specifically, only if we're creating secret_id_key do we log the
greeting (and then only if the key is actually created).
2014-12-11 18:43:51 -07:00
rl1987
9c239eccc9
Use END_CIRC_REASON_TORPROTOCOL instead of magic number.
2014-12-07 15:47:09 +02:00
Nick Mathewson
95ead31349
Tweak global_scheduler changes file
2014-11-27 23:05:21 -05:00
Nick Mathewson
a28df3fb67
Merge remote-tracking branch 'andrea/cmux_refactor_configurable_threshold'
...
Conflicts:
src/or/or.h
src/test/Makefile.nmake
2014-11-27 22:39:46 -05:00
Nick Mathewson
3d2366c676
Merge remote-tracking branch 'public/bug13126'
...
Conflicts:
src/or/or.h
2014-11-26 09:03:30 -05:00
Nick Mathewson
3a91a08e21
Merge branch 'feature9503_squashed'
2014-11-25 12:49:09 -05:00
rl1987
8c135062e5
Adding 'SIGNAL HEARTBEAT' message that causes unscheduled heartbeat.
2014-11-25 12:48:41 -05:00
Nick Mathewson
b4ead16d57
Merge remote-tracking branch 'origin/maint-0.2.5'
2014-11-24 09:19:22 -05:00
Nick Mathewson
5b55778c86
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
2014-11-24 09:19:06 -05:00
Nick Mathewson
137982f955
Merge remote-tracking branch 'karsten/geoip6-nov2014' into maint-0.2.4
2014-11-24 09:18:36 -05:00
Nick Mathewson
8d5f1e6961
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
2014-11-24 09:18:21 -05:00
Karsten Loesing
5441c733e0
Update geoip6 to the November 15 2014 database.
2014-11-24 14:23:18 +01:00
Karsten Loesing
8611c6bccd
Update geoip to the November 15 2014 database.
2014-11-24 14:21:31 +01:00
Nick Mathewson
336c856e52
Make can_complete_circuits a static variable.
2014-11-20 12:03:46 -05:00
Nick Mathewson
f15cd22bb7
Don't build introduction circuits until we know we can build circuits
...
Patch from akwizgran. Ticket 13447.
2014-11-20 11:51:36 -05:00
Nick Mathewson
b3bd7a736c
Remove Support022HiddenServices
...
This has been already disabled in the directory consensus for a while;
it didn't seem to break anything.
Finally closes #7803 .
2014-11-17 11:52:10 -05:00
rl1987
a68b90fc7a
Changes file for 13212.
2014-11-16 16:12:08 +02:00
Nick Mathewson
5c813f6ca1
Merge remote-tracking branch 'origin/maint-0.2.5'
2014-11-12 15:32:15 -05:00
Nick Mathewson
6c146f9c83
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
...
Conflicts:
src/or/config.c
2014-11-12 15:30:11 -05:00
Sebastian Hahn
0493db4adb
Add changes file for #13926
2014-11-12 15:25:52 -05:00
Nick Mathewson
9b11dc3617
Merge remote-tracking branch 'public/bug7484'
...
Conflicts:
src/test/test_addr.c
2014-11-12 13:44:57 -05:00
Nick Mathewson
2170171d84
Merge branch 'ticket13172'
2014-11-12 13:25:17 -05:00
Nick Mathewson
81433e7432
Merge remote-tracking branch 'rl1987/bug13644'
2014-11-12 13:12:14 -05:00
