Roger Dingledine
ea6ac0f0d1
Merge branch 'maint-0.2.2'
2010-09-30 00:10:14 -04:00
Roger Dingledine
3cbe463e96
Merge branch 'bug1772' into maint-0.2.2
2010-09-29 23:52:18 -04:00
Roger Dingledine
355fc63790
Merge branch 'maint-0.2.2'
2010-09-29 17:21:43 -04:00
Roger Dingledine
48cd096276
Merge commit 'mikeperry/bug1739' into maint-0.2.2
2010-09-29 17:17:59 -04:00
Roger Dingledine
474e4d2722
Merge commit 'mikeperry/bug1740' into maint-0.2.2
2010-09-29 17:05:38 -04:00
Mike Perry
f1b0e4e4b4
Add changes file.
2010-09-29 11:49:43 -07:00
Mike Perry
4caf39f1c8
Add changes file.
2010-09-29 11:46:36 -07:00
Mike Perry
caba3bc57e
Add changes file.
2010-09-29 11:41:35 -07:00
Nick Mathewson
703eb087f5
Merge remote branch 'origin/maint-0.2.2'
2010-09-29 00:38:44 -04:00
Nick Mathewson
f3e8bc391a
Remove the has_old_dnsworkers flag.
2010-09-28 23:37:45 -04:00
Roger Dingledine
7e644b3f69
a changelog entry for the entrynodes retry mess
2010-09-28 22:49:36 -04:00
Roger Dingledine
8d1fe50284
Merge branch 'maint-0.2.2'
2010-09-28 18:42:04 -04:00
Roger Dingledine
09a715bb72
Merge branch 'maint-0.2.1' into maint-0.2.2
2010-09-28 18:37:55 -04:00
Roger Dingledine
339993b409
actually retry bridges when your network goes away
2010-09-28 18:36:15 -04:00
Nick Mathewson
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
Nick Mathewson
c612ddee17
Add a new option to enable/disable IOCP support
2010-09-28 14:01:45 -04:00
Nick Mathewson
4e0f7f4ffc
Code to download, parse, and store microdesc consensuses
2010-09-27 18:04:43 -04:00
Nick Mathewson
af7fab020a
Merge remote branch 'origin/maint-0.2.2'
...
Conflicts:
src/or/config.c
2010-09-27 17:52:20 -04:00
Roger Dingledine
8df3a90946
the actual changelog entry this time
2010-09-27 17:44:51 -04:00
Sebastian Hahn
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
Nick Mathewson
5c83c06c98
Merge branch 'bufferevent5'
2010-09-27 16:48:25 -04:00
Nick Mathewson
501399d14a
Merge remote branch 'origin/maint-0.2.2'
2010-09-27 15:42:08 -04:00
Nick Mathewson
e385961542
Merge remote branch 'public/bug1954' into maint-0.2.2
2010-09-27 15:39:40 -04:00
Nick Mathewson
89e8f31c42
Add a changes file for bufferevents
2010-09-27 14:22:18 -04:00
Nick Mathewson
26811a8e2d
Merge remote branch 'origin/maint-0.2.2'
2010-09-27 12:26:23 -04:00
Nick Mathewson
24a45f54d2
Merge branch 'bug1805' into maint-0.2.2
2010-09-27 12:25:32 -04:00
Nick Mathewson
1cbdbff961
Merge remote branch 'mikeperry/bug1952-merge' into maint-0.2.2
2010-09-27 12:17:41 -04:00
Mike Perry
dfe8c2146c
Add changelog for bug 1952.
2010-09-27 09:12:00 -07:00
Nick Mathewson
2579d827ab
Use autoreconf, not autoconf&&automake&&etc in autogen.sh
...
The autoreconf tool deals much better with detecting which tools to
use on your particular platform, handling cases where your
install-sh script gets stable, and lots of other little tricky
issues.
We still fall back to autoconf&&automake&&etc in the case where
"`which autoreconf 2>/dev/null`" says something we can't run.
This is the first change of the 0.2.3.x series.
2010-09-27 11:20:12 -04:00
Nick Mathewson
c8e1538a0b
Merge remote branch 'sebastian/continuation'
2010-09-24 13:43:55 -04:00
Nick Mathewson
9b49a89430
Merge branch 'bug1511'
2010-09-23 23:16:25 -04:00
Nick Mathewson
0a0cc4599f
Tweak continuation-and-comment logic
...
I think there was a read-off-the-end-of-the-buffer bug that I fixed.
At least I added some good comments, I hope.
2010-09-23 22:58:04 -04:00
Nick Mathewson
31f22505a6
Merge remote branch 'arma/bug1362'
2010-09-22 01:45:57 -04:00
Nick Mathewson
aa7f55c45f
Use load_windows_system_library in place of LoadLibrary
2010-09-21 14:40:10 -04:00
Nick Mathewson
e476ffc2ba
Merge branch 'bug1789'
2010-09-21 14:29:59 -04:00
Nick Mathewson
9cba61eb8c
Bug1789 cleanups suggested by arma
...
The significant one is that we look at RelayBandwidthRate if it is set.
2010-09-21 14:02:04 -04:00
Roger Dingledine
fe42f10954
log when we finish a circuit after being offline
2010-09-21 02:16:43 -04:00
Nick Mathewson
5a55662a6b
Merge branch 'bug1956'
2010-09-21 00:07:45 -04:00
Roger Dingledine
fec297338f
changelog entry for bug 1943
2010-09-20 21:32:18 -04:00
Nick Mathewson
1411842933
Count unknown authorities as unknown only once, not once per signature.
...
Do not double-report signatures from unrecognized authorities both as
"from unknown authority" and "not present". Fixes bug 1956, bugfix on
0.2.2.16-alpha.
2010-09-20 13:33:57 -04:00
Sebastian Hahn
ff5ffd1776
Attempt to fix compilation on Windows
...
Our attempt to make compilation work on old versions of Windows
again while keeping wince compatibility broke the build for Win2k+.
helix reports this patch fixes the issue for WinXP. Bugfix on
0.2.2.15-alpha; related to bug 1797.
2010-09-19 13:39:30 +02:00
Roger Dingledine
80b631844b
fold in the recent changes files
2010-09-16 13:45:54 -04:00
Nick Mathewson
cc2511c347
Change 'bugfix on' line for changes/bug1921.
...
Karsten says: "the ChangeLog should say it's a bugfix on
0.2.2.15-alpha, because enabling stats while Tor is running (which
leads to this false log message) is only possible since then."
Sounds right enough to me. Tell me if I'm wrong.
2010-09-16 10:54:09 -04:00
Nick Mathewson
c009c9da01
Merge remote branch 'sebastian/bug1921'
2010-09-16 10:52:43 -04:00
Roger Dingledine
0ac67bf3c3
perconnbwrate and perconnbwburst consensus params
2010-09-16 00:17:39 -04:00
Sebastian Hahn
4f1e36ca1d
Demote a warn when enabling CellStatistics
...
When the CellStatistics option is off, we don't store cell insertion
times. Doing so would also not be very smart, because there seem to
still be some performance issues with this type of statistics. Nothing
harmful happens when we don't have insertion times, so we don't need to
alarm the user.
2010-09-16 01:13:51 +02:00
Nick Mathewson
c18bcc8a55
Merge branch 'bug1184'
2010-09-15 14:20:28 -04:00
Nick Mathewson
87f18c9578
Never queue a cell on a marked circuit
2010-09-15 13:06:54 -04:00
Nick Mathewson
60e3def3ed
Merge branch 'bug1899'
2010-09-14 22:19:25 -04:00
Nick Mathewson
e2b71d8841
Merge branch 'bug911'
2010-09-14 22:19:22 -04:00
