Arlo Breault
f591a4d94c
Remove a needless if (1)
2014-09-23 12:14:41 -04:00
Arlo Breault
c00b397992
Split dirinfo_type_t computation into a new function
2014-09-23 12:12:57 -04:00
Arlo Breault
2e16856665
Fix a comment typo.
2014-09-23 12:11:06 -04:00
Andrea Shepard
3b31b45ddb
Appease make check-spaces
2014-03-18 10:26:44 -07:00
Nick Mathewson
df836b45b0
Merge remote-tracking branch 'asn/bug5018_notice'
2014-03-12 11:10:51 -04:00
Nick Mathewson
cce06b649e
Merge remote-tracking branch 'asn/bug11069_take2'
2014-03-11 11:04:47 -04:00
George Kadianakis
1c475eb018
Throw control port warning if we failed to connect to all our bridges.
2014-03-10 22:52:07 +00:00
George Kadianakis
cc1bb19d56
Tone down the log message for when we don't need a PT proxy.
2014-03-10 22:05:31 +00:00
Nick Mathewson
b8ceb464e5
Merge branch 'bug11156_squashed'
2014-03-10 14:08:38 -04:00
Nick Mathewson
0c04416c11
Merge branch 'bug11043_take2_squashed'
2014-03-10 14:08:29 -04:00
George Kadianakis
6606e676ee
Don't do directory fetches before all PTs have been configured.
2014-03-10 14:07:56 -04:00
George Kadianakis
8c8e21e296
Improve the log message for when the Extended ORPort is not enabled.
2014-03-10 12:54:46 -04:00
Nick Mathewson
a50690e68f
Merge remote-tracking branch 'origin/maint-0.2.4'
2014-03-06 11:52:22 -05:00
Nick Mathewson
4a2a1e572e
Merge branch 'bug11108'
2014-03-06 10:22:40 -05:00
Nick Mathewson
cbf9e74236
Correct the URL in the "a relay on win95???" message
...
This is a fix for 9393; it's not a bugfix on any Tor version per se,
but rather on whatever Tor version was current when we reorganized the
wiki.
2014-03-06 09:57:42 -05:00
Nick Mathewson
663aba07e5
Fix whitespace errors, all of them mine.
2014-03-05 14:36:32 -05:00
Nick Mathewson
22ccfc6b5f
Rename PredictedCircsRelevanceTime->PredictedPortsRelevanceTime
...
All circuits are predictive; it's the ports that are expiring here.
2014-03-05 14:35:07 -05:00
Nick Mathewson
103cebd924
Merge branch 'ticket9176_squashed'
...
Conflicts:
doc/tor.1.txt
2014-03-05 14:32:05 -05:00
Nick Mathewson
25374d307d
Fix wide lines.
2014-03-05 14:31:13 -05:00
Nick Mathewson
2c25bb413e
Lower the maximum for PrecictedCircsRelevanceTime to one hour
2014-03-05 14:31:13 -05:00
unixninja92
4f03804b08
Fixed spacing.
2014-03-05 14:31:13 -05:00
unixninja92
5c310a4fa2
Added max value to PredictedCircsRelevanceTime.
2014-03-05 14:31:13 -05:00
unixninja92
898154f717
PredictedCircsRelevanceTime: limit how long we predict a port will be used
...
By default, after you've made a connection to port XYZ, we assume
you might still want to have an exit ready to connect to XYZ for one
hour. This patch lets you lower that interval.
Implements ticket 91
2014-03-05 14:29:54 -05:00
Nick Mathewson
f0b2dc83b6
Merge remote-tracking branch 'arma/ticket5528'
...
Conflicts:
src/or/router.c
src/test/test_dir.c
2014-03-05 12:44:40 -05:00
Nick Mathewson
496fe685fd
Include v3 in documented 'protocols' in rend_service_descriptor_t
...
Also make it unsigned and document that it's for INTRODUCE cell versions.
Fixes 9099; bugfix on 0.2.1.5-alpha, which introduced the v3 protocol.
2014-03-04 12:03:18 -05:00
Nick Mathewson
ab225aaf28
Merge branch 'bug10169_025_v2'
...
Conflicts:
src/test/test.c
2014-03-04 11:03:30 -05:00
Nick Mathewson
bb37544214
Merge remote-tracking branch 'public/bug10169_024' into bug10169_025_v2
...
Conflicts:
src/common/compat_libevent.h
src/or/relay.c
2014-03-04 11:00:02 -05:00
Nick Mathewson
46118d7d75
Merge remote-tracking branch 'public/bug10169_023' into bug10169_024
...
Conflicts:
src/or/relay.c
2014-03-04 10:54:54 -05:00
Nick Mathewson
0db39eb89f
ATTR_NORETURN is needed on lost_owning_controller now
...
This should fixes some "hey, that function could have
__attribute__((noreturn))" warnings introduced by f96400d9
2014-03-03 10:54:20 -05:00
Nick Mathewson
4050dfa320
Warn if ports are specified in {Socks,Dir}Policy
...
We have ignored any ports listed here since 80365b989
2014-03-03 10:45:39 -05:00
Roger Dingledine
bd49653f8e
trivial whitespace fixes
2014-03-03 06:53:08 -05:00
Nick Mathewson
0b7a66fac7
whitespace fix
2014-02-28 08:57:29 -05:00
Nick Mathewson
273f536d72
Merge branch 'bug10884_squashed'
2014-02-28 08:54:50 -05:00
Nick Mathewson
886d4be149
Unit tests for test_routerkeys_write_fingerprint
2014-02-28 08:53:14 -05:00
Nick Mathewson
25c0435aa5
Tighten router_write_fingerprint impl
2014-02-28 08:53:14 -05:00
Karsten Loesing
3ca5fe81e3
Write hashed bridge fingerprint to logs and to disk.
...
Implements #10884 .
2014-02-28 08:53:13 -05:00
Nick Mathewson
043329eeb6
Merge remote-tracking branch 'karsten/task-5824'
2014-02-28 08:32:13 -05:00
Nick Mathewson
833d027778
Monotonize the OOM-killer data timers
...
In a couple of places, to implement the OOM-circuit-killer defense
against sniper attacks, we have counters to remember the age of
cells or data chunks. These timers were based on wall clock time,
which can move backwards, thus giving roll-over results for our age
calculation. This commit creates a low-budget monotonic time, based
on ratcheting gettimeofday(), so that even in the event of a time
rollback, we don't do anything _really_ stupid.
A future version of Tor should update this function to do something
even less stupid here, like employ clock_gettime() or its kin.
2014-02-26 09:51:30 -05:00
Nick Mathewson
bf1678603f
Merge remote-tracking branch 'public/bug10449'
2014-02-25 16:09:15 -05:00
Nick Mathewson
c3800f631b
Merge remote-tracking branch 'public/no_itime_queue' into maint-0.2.4
2014-02-25 15:58:53 -05:00
Nick Mathewson
d21b24b3b6
Merge remote-tracking branch 'public/feature9777_024_squashed' into maint-0.2.4
2014-02-24 13:05:25 -05:00
Nick Mathewson
1753975ece
When not an exit node, don't test for DNS hijacking.
...
Back in 5e762e6a5c
2014-02-21 18:04:48 +00:00
Nick Mathewson
6eba3584b1
Merge remote-tracking branch 'public/bug10987_024'
2014-02-21 17:29:48 +00:00
Nick Mathewson
f3e8271652
Style tweaks on code, changes file for 10987
2014-02-21 17:27:35 +00:00
David Goulet
1532cff2ce
Fix: send back correct IPv6 SOCKS5 connect reply
...
For a client using a SocksPort connection and IPv6, the connect reply
from tor daemon did not handle AF_INET6 thus sending back the wrong
payload to the client.
A changes file is provided and this fixes #10987
Signed-off-by: David Goulet <dgoulet@ev0ke.net>
2014-02-21 17:19:11 +00:00
Nick Mathewson
3dfed0806c
Merge remote-tracking branch 'public/bug10722'
2014-02-16 12:13:12 -05:00
Nick Mathewson
b5d6e47002
Warning message when bug 10722 would trigger
...
If somebody's excludenodes settings are keeping their hidden service
connections from working, they should probably get notified about it.
2014-02-16 12:11:07 -05:00
Nick Mathewson
35423d397f
Merge branch 'bug4900_siphash_v2'
2014-02-15 15:59:10 -05:00
Nick Mathewson
b3a6907493
Remove a bunch of functions that were never called.
2014-02-15 15:33:34 -05:00
Nick Mathewson
67749475f5
Merge remote-tracking branch 'public/bug10841'
2014-02-15 15:06:06 -05:00
