Nick Mathewson
f560eeadc3
Remove the unused circuit_dump_by_chan().
...
Also remove its helper function.
2014-03-23 00:28:39 -04:00
Nick Mathewson
f4e2c72bee
Merge remote-tracking branch 'karsten/task-11070'
2014-03-23 00:18:48 -04:00
Nick Mathewson
f2c6c5e69c
Merge branch 'ticket11149'
2014-03-23 00:18:11 -04:00
Nick Mathewson
452aa18680
Merge remaining changes/* items into ChangeLog
...
(Not taking bug11235 since it's a whitespace fix)
2014-03-19 20:28:10 -04:00
Andrea Shepard
6c161d1812
Add changes file for bug #11235
2014-03-18 10:28:25 -07:00
Karsten Loesing
7450403410
Take out remaining V1 directory code.
2014-03-18 10:40:10 +01:00
Nick Mathewson
cd9d08a5e1
Sort the 0.2.5.3-alpha changelog entries a little better.
...
Still haven't edited any.
Also, remove all the changes/* entries that got merged back in
6b5ef3889d .
2014-03-13 11:34:51 -04:00
Nick Mathewson
9991c5f001
Clarify ClientOnly documentation
...
The option is unneeded, not meaningless, so explain what it does.
Patch from Matt Pagan; fixes 9059.
2014-03-13 10:35:52 -04:00
Nick Mathewson
b1ec216fbc
bugfix-on for 5018_notice
2014-03-12 11:11:26 -04: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
1365ff5b9a
Upgrade to the latest version of tinytest.
...
This brings us to tinytest commit 709a36ba63ff16d8.
The only big change tor-side is that we don't need our own test_mem_op
operation any longer.
2014-03-06 18:06:08 -05:00
Nick Mathewson
065097b81b
tinytest tt_{mem,str}_op now handle NULLs better
...
Now a NULL argument to either makes it fail, not crash.
Fies bug 9004; bugfix on 0.2.2.4-alpha.
2014-03-06 12:12:13 -05: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
a4b447604a
Stop accepting 0.2.2 relay uploads for the consensus.
...
Resolves ticket 11149.
2014-03-06 09:38:35 -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
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
1295490862
Merge remote-tracking branch 'public/bug8788'
2014-03-05 12:17:31 -05:00
Nick Mathewson
27d231ca13
Document alternate bandwidth/memory unit spellings
2014-03-04 12:12:36 -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
4050dfa320
Warn if ports are specified in {Socks,Dir}Policy
...
We have ignored any ports listed here since 80365b989 (0.0.7rc1),
but we didn't warn the user that we were ignoring them. This patch
adds a warning if you put explicit ports in any of the options
{Socks,Dir}Policy or AuthDir{Reject,Invalid,BadDir,BadExit}. It
also adjusts the manpage to say that ports are ignored.
Fixes ticket 11108.
2014-03-03 10:45:39 -05:00
Nick Mathewson
1afa52349c
tweak changes file.
2014-03-03 09:56:17 -05:00
Lunar
3a425ac3a8
Fix max client name length in HiddenServiceAuthorizeClient description
...
REND_CLIENTNAME_MAX_LEN is set to 16, not 19.
2014-03-03 09:53:38 -05:00
Nick Mathewson
273f536d72
Merge branch 'bug10884_squashed'
2014-02-28 08:54:50 -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
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
92da2e27a2
Merge remote-tracking branch 'public/bug11048'
2014-02-25 10:23:09 -05:00
Nick Mathewson
23a5921e9a
Merge remote-tracking branch 'origin/maint-0.2.4'
2014-02-25 10:04:10 -05:00
Nick Mathewson
d7950eda2b
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
2014-02-25 10:02:14 -05:00
Karsten Loesing
2658e70d16
Fix geoip by falling back to registered countries.
...
See 1d2179bc90 in master for details.
"""
Fall back to registered country if necessary.
When extracting geoip and geoip6 files from MaxMind's GeoLite2 Country
database, we only look at country->iso_code which is the two-character ISO
3166-1 country code of the country where MaxMind believes the end user is
located.
But if MaxMind thinks a range belongs to anonymous proxies, they don't put
anything there. Hence, we omit those ranges and resolve them all to '??'.
That's not what we want.
What we should do is first try country->iso_code, and if there's no such
key, try registered_country->iso_code which is the country in which the
ISP has registered the IP address.
In short: let's fill all A1 entries with what ARIN et. al think.
"""
2014-02-25 13:28:34 +01:00
Nick Mathewson
0efa2821c7
Merge branch 'bug11047'
2014-02-24 13:06:55 -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
a3ab31f5dc
Threadproof our log_backtrace implementation
...
It's possible for two threads to hit assertion failures at the same
time. If that happens, let's keep them from stomping on the same
cb_buf field.
Fixes bug 11048; bugfix on 0.2.5.2-alpha. Reported by "cypherpunks".
2014-02-24 12:15:32 -05:00
Nick Mathewson
68ed4878ca
pass our compiler -fasynchronous-unwind-tables by default
...
This should make more platforms (in particular, ones with compilers
where -fomit-frame-pointer is on by default but table generation
isn't) support backtrace generation. Thanks to cypherpunks for this
one.
Fixes bug 11047; bugfix on 0.2.5.2-alpha.
2014-02-24 11:45:03 -05:00
Nick Mathewson
1753975ece
When not an exit node, don't test for DNS hijacking.
...
Back in 5e762e6a5c , non-exit servers
stopped launching DNS requests for users. So there's no need for them
to see if their DNS answers are hijacked.
Patch from Matt Pagan. I think this is a 965 fix.
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