Nick Mathewson
8c528bc320
Merge commit 'origin/maint-0.2.1'
...
Conflicts:
src/or/reasons.c
2010-08-18 13:48:39 -04:00
Sebastian Hahn
78e4aa63fb
Backport END_STREAM_REASON_NOROUTE for client use.
...
(Partial backport of 150ed553df
, 161b275028
, and 4c948ffd6.)
2010-08-18 11:12:32 -04:00
Nick Mathewson
a509dbba50
Merge commit 'karsten/dirbytes2'
...
Conflicts:
src/or/rephist.h
2010-08-18 10:06:14 -04:00
Karsten Loesing
58b6195455
Correctly report written bytes on linked connections.
2010-08-18 13:54:41 +02:00
Karsten Loesing
db94b7f46e
Count bytes we spend on answering directory requests.
2010-08-18 13:54:41 +02:00
Sebastian Hahn
d5c83f2014
Remove unused function declarations
...
Also remove some #if 0'd code from the unit tests for buffers. The
code was killed in e6794e5808
(5 years
ago), and is now broken anyways.
2010-08-17 23:49:39 +02:00
Nick Mathewson
5ffe105598
Merge branch 'maint-0.2.1'
...
Resolved conflict in
src/or/networkstatus.c
2010-08-17 12:07:19 -04:00
Nick Mathewson
fc66a2ad1b
Merge branch 'bug1141_v3' into maint-0.2.1
2010-08-17 11:55:58 -04:00
Nick Mathewson
6f58481335
Scale CONSENSUS_MIN_SECONDS_BEFORE_CACHING by voting interval
...
If the voting interval was short enough, the two-minutes delay
of CONSENSUS_MIN_SECONDS_BEFORE_CACHING would confuse bridges
to the point where they would assert before downloading a consensus.
It it was even shorter (<4 minutes, I think), caches would
assert too. This patch fixes that by having replacing the
two-minutes value with MIN(2 minutes, interval/16).
Bugfix for 1141; the cache bug could occur since 0.2.0.8-alpha, so
I'm calling this a bugfix on that. Robert Hogan diagnosed this.
Done as a patch against maint-0.2.1, since it makes it hard to
run some kinds of testing networks.
2010-08-17 11:55:39 -04:00
Roger Dingledine
2ede14c2ca
fold in the next set of changelog entries
2010-08-16 02:02:11 -04:00
Nick Mathewson
bf8d66364f
Merge commit 'public/warn1125'
2010-08-16 00:27:05 -04:00
Karsten Loesing
15379a7254
Fix compilation with --with-dmalloc
...
Fixes 1832; bugfix on 0.2.2.6-alpha
2010-08-16 00:14:06 -04:00
Roger Dingledine
4c948ffd6c
161b2750
didn't really retry the stream. this does.
2010-08-16 00:04:49 -04:00
Nick Mathewson
b51f1a64e4
Make Sebastian's bug1831 branch build with --enable-gcc-warnings
2010-08-15 23:46:09 -04:00
Nick Mathewson
a856f446c7
Merge commit 'sebastian/bug1831'
2010-08-15 23:43:36 -04:00
Nick Mathewson
6a77bde8d8
Make Sebastian's misc-reasons branch compile; frob the changes file
2010-08-15 21:32:06 -04:00
Nick Mathewson
9bcea4a8ef
Merge commit 'sebastian/misc-reason'
2010-08-15 21:27:32 -04:00
Nick Mathewson
5757f47fc3
Make unit tests work when tests get run in subprocesses.
...
Apparently the way we handled cleaning up temporary directories with
atexit() meant that when the child process exited, it would remove the
temporary directory, thus making other tests in the main process fail.
2010-08-15 21:20:19 -04:00
Nick Mathewson
8394c70204
Rename rep_hist_exit_stats_history in test.c too
2010-08-15 20:55:24 -04:00
Nick Mathewson
c370ee7aa7
Add a changes file for Karsten's stats-tests branch
2010-08-15 20:54:57 -04:00
Nick Mathewson
8351881b2e
Merge commit 'karsten/stats-tests'
2010-08-15 20:49:37 -04:00
Nick Mathewson
a5d8ed7990
Merge commit 'karsten/stats-manpage'
2010-08-15 20:23:50 -04:00
Sebastian Hahn
561ca9b987
Fix misplaced labels
2010-08-16 00:46:44 +02:00
Sebastian Hahn
a64e660f0e
Add a rule to detect misplaced labels during check-spaces
2010-08-16 00:46:44 +02:00
Sebastian Hahn
b2dcff5766
Fix a memory leak in dirvote_compute_consensuses()
2010-08-16 00:46:44 +02:00
Sebastian Hahn
527581194c
Fix a memory leak
...
It happened in dirvote_add_signatures_to_pending_consesus().
2010-08-16 00:46:42 +02:00
Sebastian Hahn
4c49d3c27e
Refactor circuit_build_times_parse_state
...
Remove the msg parameter to pass an error message out. This
wasn't needed and made it harder to detect a memory leak.
2010-08-16 00:45:32 +02:00
Sebastian Hahn
70f0ba1495
Fix a memory leak in circuit_build_times_parse_state
...
Thanks weasel for noticing.
2010-08-16 00:33:29 +02:00
Karsten Loesing
8dadc7a7aa
Update man page, now that *Statistics can be changed while Tor is running.
2010-08-15 15:51:31 +02:00
Karsten Loesing
0e8513d4c6
Run test_stats in a subprocess.
2010-08-15 14:30:37 +02:00
Karsten Loesing
69545efbaf
Give rep_hist_exit_stats_history() a better name.
2010-08-15 14:15:58 +02:00
Karsten Loesing
3d77c67d93
Fix memory leak spotted by Nick.
2010-08-15 13:34:57 +02:00
Roger Dingledine
8d588e7b1a
reinit per-conn token buckets on config or consensus change
2010-08-15 04:01:42 -04:00
Roger Dingledine
2bc1842aaa
factor out rate/burst setting. no actual changes.
2010-08-15 02:27:07 -04:00
Roger Dingledine
a207d9db4c
fix another piece of 1741
2010-08-14 04:22:08 -04:00
Roger Dingledine
e50857b67f
changes entry for bug 1741
2010-08-13 20:50:51 -04:00
Mike Perry
5b0c0e1f89
Add check for CIRCUIT_PURPOSE_S_REND_JOINED.
...
These circuits stick around much longer than others on the server side for
performance reasons. Their lifetime is controlled by the client.
2010-08-13 20:46:33 -04:00
Roger Dingledine
b1a5888553
fix a memory leak introduced by df1ef2f0f0
2010-08-13 17:30:50 -04:00
Roger Dingledine
a1686d867e
fold in the makefile.am changes entry
2010-08-13 17:19:04 -04:00
Roger Dingledine
1ac1f048ef
minor formatting / comment fixes
2010-08-13 17:18:45 -04:00
Sebastian Hahn
2d8db2aacb
Fix url in rend-spec
...
Fixes bug 1822
2010-08-12 02:40:19 +02:00
Chris Ball
16970d83cc
doc/HACKING: Explain how to find when a given change was introduced
2010-08-12 02:38:58 +02:00
Sebastian Hahn
28962ecae8
Fix a typo in control-spec
2010-08-12 02:38:58 +02:00
Karsten Loesing
acd25558b8
Refactor exit port statistics code and add unit tests.
2010-08-11 16:19:54 +02:00
Nick Mathewson
1cf19b5046
Merge branch 'build-wo-asciidoc-on-bsd'
2010-08-11 09:42:05 -04:00
Linus Nordberg
5b69cf85fa
Fix changes/ file for bug #1773 .
2010-08-11 09:41:51 -04:00
Linus Nordberg
0b96abe74f
Bug #1773 : Revert bad fix ( 4ef609b8
) and do it properly.
...
* doc/Makefile.am: Move $(VAR:MOD) expansions inside "if USE_ASCIIDOC".
* doc/Makefile.am: Use proper variable name for text input files.
* doc/Makefile.am: Initialize vars to empty when !USE_ASCIIDOC.
2010-08-11 09:41:34 -04:00
Roger Dingledine
863b6c439e
changelog entry for f060b18e6c
2010-08-11 02:11:05 -04:00
Roger Dingledine
267c976405
fold in most of the changes/foo files
2010-08-11 01:51:41 -04:00
Roger Dingledine
45c6b5de17
tiny change i found in my other sandbox
2010-08-11 01:48:29 -04:00