Roger Dingledine
910de7dfac
final touchups
2010-11-16 01:12:32 -05:00
Roger Dingledine
4f66bf4fe7
Merge branch 'maint-0.2.2'
...
Conflicts:
configure.in
contrib/tor-mingw.nsi.in
src/win32/orconfig.h
2010-11-16 00:21:41 -05:00
Roger Dingledine
e1e7988537
bump to 0.2.2.18-alpha
2010-11-16 00:20:49 -05:00
Roger Dingledine
6b82a6e88d
Merge branch 'maint-0.2.2'
2010-11-16 00:16:25 -05:00
Roger Dingledine
a08a7e0fc6
warn more about AllowSingleHopExits
2010-11-16 00:13:25 -05:00
Roger Dingledine
e0b922b7e6
merge in more changelog entries
2010-11-15 23:54:20 -05:00
Roger Dingledine
a641646a98
Merge commit 'nickm/1776_redux_v1' into maint-0.2.2
2010-11-15 23:29:09 -05:00
Nick Mathewson
45b500d5a6
Clean up my 1776 fix a bit
...
Sebastian notes (and I think correctly) that one of our ||s should
have been an &&, which simplifies a boolean expression to decide
whether to replace bridges. I'm also refactoring out the negation at
the start of the expression, to make it more readable.
2010-11-15 19:43:53 -05:00
Nick Mathewson
550be1df69
Merge remote branch 'origin/maint-0.2.2'
2010-11-15 15:41:37 -05:00
Nick Mathewson
cbad9f4520
Move controller event for socks warning into log_unsafe_socks_warning
2010-11-15 15:41:21 -05:00
Nick Mathewson
9399b885cd
Merge remote branch 'origin/maint-0.2.2'
...
Conflicts:
src/or/buffers.c
2010-11-15 15:37:23 -05:00
Nick Mathewson
522c204ac9
Merge branch 'bug2000_nm_022' into maint-0.2.2
2010-11-15 15:31:40 -05:00
Nick Mathewson
ba1b7a1ce1
Merge remote branch 'origin/maint-0.2.2'
2010-11-15 14:30:12 -05:00
Nick Mathewson
29c468146d
changes entry for nopublish removal in 5040c855d
2010-11-15 14:29:53 -05:00
Nick Mathewson
8c2affe637
Merge remote branch 'origin/maint-0.2.2'
...
Conflicts:
src/or/config.c
src/or/cpuworker.c
2010-11-15 14:14:13 -05:00
Nick Mathewson
ac2c0cb587
Make the coducmentation for SingleHop stuff slightly more dire
2010-11-15 14:09:32 -05:00
Nick Mathewson
433a98131a
Merge remote branch 'sebastian/manpagefixups' into maint-0.2.2
2010-11-15 14:07:00 -05:00
Sebastian Hahn
da3a6e724f
Rate-limit unsafe socks warning
...
Pick 5 seconds as the limit. 5 seconds is a compromise here between
making sure the user notices that the bad behaviour is (still) happening
and not spamming their log too much needlessly (the log message is
pretty long). We also keep warning every time if safesocks is
specified, because then the user presumably wants to hear about every
blocked instance.
(This is based on the original patch by Sebastian, then backported to
0.2.2 and with warnings split into their own function.)
2010-11-15 13:57:37 -05:00
Karsten Loesing
ff1cf35442
Don't use log_err for non-criticial warnings.
2010-11-15 13:39:53 +01:00
Karsten Loesing
cec21652a7
Try harder not to exceed the 50 KB extra-info descriptor limit.
...
Our checks that we don't exceed the 50 KB size limit of extra-info
descriptors apparently failed. This patch fixes these checks and reserves
another 250 bytes for appending the signature. Fixes bug 2183.
2010-11-15 12:51:51 +01:00
Nick Mathewson
3d7772ece3
Merge remote branch 'karsten/enhancement1883'
2010-11-12 14:13:17 -05:00
Nick Mathewson
d61736aa6a
Merge remote branch 'origin/maint-0.2.2'
2010-11-12 13:06:54 -05:00
Nick Mathewson
dbba84c917
Avoid perma-blocking the controller on bug in shrink_freelist
...
In all likelihood, this bug would make Tor assert, but if it doesn't,
let's not have two bugs.
2010-11-12 13:05:58 -05:00
Nick Mathewson
3a7614c670
Add changes file for bug1125
2010-11-12 13:03:18 -05:00
Nick Mathewson
22318e952e
Merge remote branch 'rransom/bug1125-022' into maint-0.2.2
2010-11-12 13:03:00 -05:00
Nick Mathewson
2f8114d0a7
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
2010-11-12 13:01:41 -05:00
Nick Mathewson
566a115be1
Add changes file for bug1125
2010-11-12 12:59:42 -05:00
Robert Ransom
a421e284d0
Disable logging to control port connections in buf_shrink_freelists.
...
If buf_shrink_freelists calls log_warn for some reason, we don't want the log
call itself to throw buf_shrink_freelists further off the rails.
2010-11-12 03:07:09 -08:00
Robert Ransom
81affe1949
Move the original log_info call out of the core of buf_shrink_freelists.
...
Sending a log message to a control port can cause Tor to allocate a buffer,
thereby changing the length of the freelist behind buf_shrink_freelists's back,
thereby causing an assertion to fail.
Fixes bug #1125 .
2010-11-12 03:04:07 -08:00
Robert Ransom
6a0657d4bb
Disable logging to control port connections in buf_shrink_freelists.
...
If buf_shrink_freelists calls log_warn for some reason, we don't want the log
call itself to throw buf_shrink_freelists further off the rails.
2010-11-12 02:34:58 -08:00
Robert Ransom
6d2e02d79b
Move the original log_info call out of the core of buf_shrink_freelists.
...
Sending a log message to a control port can cause Tor to allocate a buffer,
thereby changing the length of the freelist behind buf_shrink_freelists's back,
thereby causing an assertion to fail.
Fixes bug #1125 .
2010-11-12 02:34:51 -08:00
Karsten Loesing
8833381d9c
Add two fixes to the new geoip-db-digest line.
2010-11-12 09:11:11 +01:00
Nick Mathewson
edec2797d7
Stop linking src/tools/* against libevent
2010-11-11 23:50:33 -05:00
Nick Mathewson
ae5cdb8fa7
Merge remote branch 'public/refactor_pports'
2010-11-11 23:09:42 -05:00
Nick Mathewson
67e7dbca80
Fix up tor-fw-helper "INCLUDES" directive
2010-11-11 14:33:40 -05:00
Nick Mathewson
223fc208f6
Split long lines in configure.in and Makefile.am files
...
Having very long single lines with lots and lots of things in them
tends to make files hard to diff and hard to merge. Since our tools
are one-line-at-a-time, we should try to construct lists that way too,
within reason.
This incidentally turned up a few headers in configure.in that we were
for some reason searching for twice.
2010-11-11 14:22:48 -05:00
Nick Mathewson
2b4ed1d07e
Merge remote branch 'origin/maint-0.2.2'
...
Conflicts:
configure.in
2010-11-11 13:59:18 -05:00
Nick Mathewson
5beb8ee4e1
Merge remote branch 'sebastian/remove-osx-expert-package' into maint-0.2.2
2010-11-11 13:53:53 -05:00
Roger Dingledine
a29596556c
Merge branch 'maint-0.2.2'
...
Conflicts:
src/or/config.c
2010-11-11 12:19:37 -05:00
Roger Dingledine
362bb5c625
Merge branch 'maint-0.2.1' into maint-0.2.2
2010-11-11 12:12:17 -05:00
Roger Dingledine
0a38358210
let unpublished bridges learn their ip address too
2010-11-11 11:26:42 -05:00
Nick Mathewson
d4e660ff68
Merge remote branch 'origin/maint-0.2.2'
2010-11-10 16:07:04 -05:00
Nick Mathewson
a4bf5b51e9
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
2010-11-10 16:06:43 -05:00
Nick Mathewson
2a50dd9359
Enforce multiplicity rules when parsing annotations.
...
We would never actually enforce multiplicity rules when parsing
annotations, since the counts array never got entries added to it for
annotations in the token list that got added by earlier calls to
tokenize_string.
Found by piebeer.
2010-11-10 16:02:02 -05:00
Nick Mathewson
089137f011
Fix a bug where seting allow_annotations==0 only ignores annotations, but does not block them
2010-11-10 16:02:02 -05:00
Nick Mathewson
accc51b68c
Bulletproof the routerlist manipulation functions to handle reinserting the same descriptor
2010-11-10 14:55:00 -05:00
Sebastian Hahn
6bde512edc
Document hs dht min uptime change in privnets
...
In f87c6f100d
2010-11-10 15:48:26 +01:00
Sebastian Hahn
bae80eef4b
Document the AllowSingleHopExits option
2010-11-10 15:48:26 +01:00
Sebastian Hahn
0b05f05bbf
Improve documentation for RelayBandwdith* options
...
Jesse Adelman noticed that we don't currently describe what
happens very well.
2010-11-10 15:48:26 +01:00
Sebastian Hahn
6de673076f
Add V3BandwidthsFile to the manpage
2010-11-10 15:48:26 +01:00
