Nick Mathewson
579808d4cd
Merge remote-tracking branch 'origin/maint-0.2.3'
...
Conflicts:
src/config/geoip
2012-12-13 12:52:44 -05:00
Nick Mathewson
52bf1556b1
Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3
2012-12-13 12:51:28 -05:00
Nick Mathewson
cfa07f397d
Note that fallback_dirsource was proposal 206, bug 572.
2012-12-13 12:47:46 -05:00
Nick Mathewson
6a468a1722
Fix two wide lines in config.c
2012-12-13 12:44:17 -05:00
Nick Mathewson
01ac961ca1
Merge branch 'fallback_dirsource_v3'
2012-12-13 12:42:29 -05:00
Karsten Loesing
6bdfa295b5
Add link explaining how the geoip file was created.
2012-12-13 08:45:25 +01:00
Karsten Loesing
c9a5d613a6
Update to the December 2012 GeoIP database.
2012-12-13 08:44:30 +01:00
Karsten Loesing
d2cfd52d2c
Update to the November 2012 GeoIP database.
2012-12-13 08:44:20 +01:00
Nick Mathewson
21b5d76aa5
Mention that dist-geoip6 was bug 7655
2012-12-11 18:11:49 -05:00
Nick Mathewson
c8056dcbbb
Fix some wide lines
2012-12-07 14:14:20 -05:00
Nick Mathewson
3fa9151f26
Merge branch 'win64-7260'
...
Conflicts:
src/or/dns.c
2012-12-07 14:12:17 -05:00
Nick Mathewson
cd4f56a37c
Fix infinite loop in circuit_expire_bulding
...
Fixes bug 7663; bug introduced in 42e3c04a7a
2012-12-07 14:08:07 -05:00
Nick Mathewson
504d4aa8c6
Expand the manpage to say: watch out for nonlocal socks
...
This clears up the remaining issue stopping me from closing bug 6297.
2012-12-07 12:42:55 -05:00
Nick Mathewson
f366b0112e
Merge remote-tracking branch 'karsten/task-6266'
2012-12-07 11:39:56 -05:00
Nick Mathewson
81fcebcd05
Merge branch 'bug7306'
2012-12-07 11:11:26 -05:00
Nick Mathewson
025dc19b63
Merge remote-tracking branch 'public/bug6887'
2012-12-07 11:02:27 -05:00
Nick Mathewson
f4f7e7a6f8
Merge branch 'bug3443_squashed'
2012-12-07 10:35:41 -05:00
Mike Perry
42e3c04a7a
Bug 3443: Don't count ORconn setup in circuit build time.
...
Also, add a hack Roger suggested where we're more patient if no circuits are
opened yet.
2012-12-07 10:34:09 -05:00
Nick Mathewson
f742b33d85
Drop FallbackNetworkstatusFile; it never worked.
2012-12-06 11:28:49 -05:00
Nick Mathewson
a8d491a8fd
Add an option to weight down authorities when choosing a fallback
2012-12-06 11:28:49 -05:00
Nick Mathewson
06cd62266f
Add a way to configure selection weights for dir_server_t
2012-12-06 11:28:49 -05:00
Nick Mathewson
4e3d07a68a
When choosing among dirserver_ts, consider their weights
2012-12-06 11:28:49 -05:00
Nick Mathewson
90f6071d8d
New FallbackDir option to add extra directories for bootstraping
...
This replaces the old FallbackConsensus notion, and should provide a
way -- assuming we pick reasonable nodes! -- to give clients
suggestions of placs to go to get their first consensus.
2012-12-06 11:28:49 -05:00
Nick Mathewson
46a62e3256
Refactor add_trusted_dir_server
...
Now creating a dir_server_t and adding it are separate functions, and
there are frontend functions for adding a trusted dirserver and a
fallback dirserver.
2012-12-06 11:28:48 -05:00
Nick Mathewson
705ee3b5d4
Rename trusted_dir_server_t to dir_server_t. Automatic renaming.
2012-12-06 11:27:20 -05:00
Nick Mathewson
ded70363a7
Rename DirServer to DirAuthority
2012-12-06 11:23:43 -05:00
Nick Mathewson
5c51b3f1f0
Start refactoring trusted_dir_servers into trusted and fallback lists
...
We use trusted_dir_server_t for two pieces of functionality: a list of
all directory authorities, and a list of initial places to look for
a directory. With this patch we start to separate those two roles.
There is as of now no actual way to be a fallback directory without being
an authority.
2012-12-06 11:23:43 -05:00
Nick Mathewson
404e3dd481
Correct moribund logic about caching v2 networkstatuses
2012-12-06 11:15:01 -05:00
Nick Mathewson
194cc24792
Make output of router_get_trusted_dir_servers const
2012-12-06 11:15:01 -05:00
Nick Mathewson
b326e76144
Use FreeLibrary, not CloseHandle, for library in test_util.c
...
Fix for bug 7306. Bugfix on 0.2.2.17-alpha.
2012-12-06 10:59:02 -05:00
Karsten Loesing
c718921d34
Update to the December 2012 GeoIP database.
2012-12-06 11:29:47 +01:00
Nick Mathewson
bd93ff8dd7
Merge remote-tracking branch 'asn/bug7592_take2'
2012-12-04 21:47:45 -05:00
George Kadianakis
c01dfd5d7b
Return connection_exit_connect() if payload creation failed.
...
Fixes bug #7592 ; bugfix on 882b389668
2012-12-05 04:32:11 +02:00
Roger Dingledine
e899d49e2f
fix some typos
2012-12-03 13:33:43 -05:00
Nick Mathewson
190c1d4981
Merge branch 'bug7013_take2_squashed'
2012-11-27 22:18:16 -05:00
George Kadianakis
6f21d2e496
Introduce tor_addr_port_parse() and use it to parse ServerTransportListenAddr.
2012-11-27 22:18:08 -05:00
George Kadianakis
f88c303869
Add a torrc option to specify the bind address of managed proxies.
2012-11-27 22:18:08 -05:00
Karsten Loesing
35d09dd6ac
Update to the November 2012 GeoIP database.
2012-11-27 21:26:52 -05:00
Karsten Loesing
2bf195d0ce
Add script to fix "A1" entries in geoip file.
...
Fixes #6266 .
2012-11-27 21:24:07 -05:00
Nick Mathewson
267c0e5aa1
Make sure that the error in ADDRMAP events is well-formed
...
"error=Unable to launch resolve request" is not a nice thing to tell
the controller. Bugfix on 0.2.0.19-alpha (c11c48fc
2012-11-23 11:36:44 -05:00
Nick Mathewson
06703f84df
Minor documentation fix
2012-11-23 10:51:11 -05:00
Nick Mathewson
99669c69b3
Note limitation of parse_rfc_1123_time
...
RFC1123 suggests that we should handle two-year times, and a full
range of time zones, and other stuff too. We don't.
2012-11-23 10:06:16 -05:00
Nick Mathewson
864e15cd1c
In comments and logs, say "UTC" not "GMT"
...
Fix for #6113 .
Note that the RFC1123 times we generate still all say 'GMT'. I'm
going to suggest this is not worth changing.
2012-11-23 10:05:16 -05:00
Nick Mathewson
e6828ea634
Refer to RFC 4648 instead of the obsolete RFC 3548
...
Affects comments only. For ticket 6849.
2012-11-23 09:51:35 -05:00
Roger Dingledine
0f9524dbd0
forward-port the 0.2.3.25 changelog and release notes
2012-11-20 03:46:56 -05:00
Nick Mathewson
ea893a3c30
Merge branch 'bug7493_redux'
2012-11-18 18:46:57 -05:00
Nick Mathewson
bfe8d829c2
Initialize ipv{4,6}_traffic_ok in entry_connection_new
...
This one is necessary for sending BEGIN cells with sane flags when
self-testing a directory port. All real entry connections were
getting their ipv{4,6}_traffic_ok flags set from their listeners, and
for begindir entry connections we didn't care, but for directory
self-testing, we had a problem.
Fixes at least one more case of 7493; if there are more lingering
cases of 7493, this might fix them too.
Bug not in any released version of Tor.
2012-11-18 17:15:41 -05:00
Roger Dingledine
06d367ea36
when counting available descs, say whether we're counting exits
2012-11-16 11:38:56 -05:00
Nick Mathewson
ecb619d96b
Give useful warning when both IPv4 and IPv6 are disabled on a socksport
2012-11-15 22:58:54 -05:00
Nick Mathewson
28cbe90839
Allow IPv4 traffic on default and old-style-config SocksPorts.
...
Looks like when i was writing the code to set the ipv4_traffic flag on
port_cfg_t, I missed some cases, such as the one where the port was
set from its default value.
Fix for 7493. Bug not in any released Tor.
2012-11-15 22:49:43 -05:00
