355fc63790
Merge branch 'maint-0.2.2'
2010-09-29 17:21:43 -04:00
48cd096276
Merge commit 'mikeperry/bug1739' into maint-0.2.2
2010-09-29 17:17:59 -04:00
474e4d2722
Merge commit 'mikeperry/bug1740' into maint-0.2.2
2010-09-29 17:05:38 -04:00
4caf39f1c8
Add changes file.
2010-09-29 11:46:36 -07:00
c5b5643965
Send control port events for timeouts.
...
We now differentiate between timeouts and cutoffs by the REASON string and
the PURPOSE string.
2010-09-29 11:46:36 -07:00
caba3bc57e
Add changes file.
2010-09-29 11:41:35 -07:00
5aa4564ab9
Only count timeout data for 3 hop circuits.
...
Use 4/3 of this timeout value for 4 hop circuits, and use half of it for
canabalized circuits.
2010-09-29 11:41:27 -07:00
50720a9a4f
make c612ddee compile with old libevents
2010-09-29 02:50:46 -04:00
703eb087f5
Merge remote branch 'origin/maint-0.2.2'
2010-09-29 00:38:44 -04:00
a58610a87e
even more comment
2010-09-28 23:50:56 -04:00
f3e8bc391a
Remove the has_old_dnsworkers flag.
2010-09-28 23:37:45 -04:00
512433346f
improve code comments, based on comments from nick
2010-09-28 23:27:00 -04:00
7e644b3f69
a changelog entry for the entrynodes retry mess
2010-09-28 22:49:36 -04:00
9997676802
handle ugly edge case in retrying entrynodes
...
Specifically, a circ attempt that we'd launched while the network was
down could timeout after we've marked our entrynodes up, marking them
back down again. The fix is to annotate as bad the OR conns that were
around before we did the retry, so if a circuit that's attached to them
times out we don't do anything about it.
2010-09-28 22:32:38 -04:00
7de1caa33f
Actually notice when our last entrynode goes down
...
Otherwise we'd never set have_minimum_dir_info to false, so the
"optimistic retry" would never trigger.
2010-09-28 21:59:31 -04:00
bb22360bad
optimistically retry EntryNodes on socks request
...
We used to mark all our known bridges up when they're all down and we
get a new socks request. Now do that when we've set EntryNodes too.
2010-09-28 19:10:23 -04:00
8bac188572
remove a redundant assert
2010-09-28 19:10:22 -04:00
127f37ad29
refactor; no actual changes
2010-09-28 19:10:22 -04:00
8d1fe50284
Merge branch 'maint-0.2.2'
2010-09-28 18:42:04 -04:00
09a715bb72
Merge branch 'maint-0.2.1' into maint-0.2.2
2010-09-28 18:37:55 -04:00
339993b409
actually retry bridges when your network goes away
2010-09-28 18:36:15 -04:00
3efaa30727
Merge branch 'iocp_option'
2010-09-28 14:42:52 -04:00
c58b7a1095
Merge remote branch 'origin/maint-0.2.2'
2010-09-28 14:42:50 -04:00
73d93c033d
Autodetect the number of CPUs when possible if NumCPUs==0
...
This is needed for IOCP, since telling the IOCP backend about all
your CPUs is a good idea. It'll also come in handy with asn's
multithreaded crypto stuff, and for people who run servers without
reading the manual.
2010-09-28 14:42:21 -04:00
c612ddee17
Add a new option to enable/disable IOCP support
2010-09-28 14:01:45 -04:00
6d8f2885d8
Remove the completely outdated Win32Build directory
...
If you want to try to build Tor with a recent MSVC, you are better
off starting from scratch than trying to use the project files that
we used to build 2006 versions of Tor using 2006 versions of MSVC.
2010-09-28 13:38:28 -04:00
d6e255edbd
Merge branch 'microdesc_dl_v2'
2010-09-28 00:46:01 -04:00
f006f02ca4
Merge branch 'maint-0.2.2'
2010-09-27 18:33:12 -04:00
a467bf5fbb
a dir-spec entry for refuseunknownexits
...
plus quiet a log line
2010-09-27 18:32:09 -04:00
d45b912058
Clean long-unlisted microdescs from the cache
2010-09-27 18:05:01 -04:00
3a492d31d5
Download microdescriptors if you're a cache
...
This commit adds some functions to see what microdescriptors we're missing,
and adds fetch-microdesc/store-microdesc logic to the directory code.
2010-09-27 18:04:44 -04:00
e34d0d3365
When updating routerdesc downloads, look specifically at the ns consensus
...
This will be needed when "get_live_consensus" potentially returns a
microdesc consensus.
2010-09-27 18:04:44 -04:00
9f5b752e4f
Actually parse the m lines from a microdesc consensus
2010-09-27 18:04:44 -04:00
4e0f7f4ffc
Code to download, parse, and store microdesc consensuses
2010-09-27 18:04:43 -04:00
4bfc64ba1c
New function to grab a directory connection fetching a resource
...
We need this to tell if a given consensus flavor is being downloaded
or not.
2010-09-27 18:04:43 -04:00
af7fab020a
Merge remote branch 'origin/maint-0.2.2'
...
Conflicts:
src/or/config.c
2010-09-27 17:52:20 -04:00
8df3a90946
the actual changelog entry this time
2010-09-27 17:44:51 -04:00
9d7f0badb5
changelog entry for bug1751
2010-09-27 17:44:00 -04:00
614eeb378b
Merge remote branch 'sebastian/bug1964' into maint-0.2.2
2010-09-27 17:26:32 -04:00
c951830002
Fix a bridge segfault
...
When we enabled support to change statistic options without restarting
Tor we forgot to initialize geoip_countries. Fix that.
2010-09-27 23:19:25 +02:00
7c83b0a2a2
Merge branch 'refuseunknown' into maint-0.2.2
2010-09-27 17:15:57 -04:00
8ac2de5ab9
Add RefuseUnknownExits to the manpage
2010-09-27 17:15:41 -04:00
c97072ef34
Merge branch 'bug1751_enabling' into maint-0.2.2
2010-09-27 17:08:03 -04:00
6c5b9ba625
Change bug1751 enabling code based on comments from arma
2010-09-27 17:07:22 -04:00
5c83c06c98
Merge branch 'bufferevent5'
2010-09-27 16:48:25 -04:00
6950749c0a
Make the bufferevent code use the renegotiation-reenabling hack
2010-09-27 16:07:14 -04:00
501399d14a
Merge remote branch 'origin/maint-0.2.2'
2010-09-27 15:42:08 -04:00
e385961542
Merge remote branch 'public/bug1954' into maint-0.2.2
2010-09-27 15:39:40 -04:00
21e5f3c431
Detect Libevent version at configure time when using bufferevents
2010-09-27 14:29:49 -04:00
b7ae108e18
Always defer bufferevent_openssl callbacks to avoid reentrant invocations
2010-09-27 14:29:42 -04:00
Roger Dingledine
Mike Perry
Nick Mathewson
Sebastian Hahn