Roger Dingledine
165aaf560a
Merge branch 'maint-0.2.2'
2010-10-01 14:12:11 -04:00
Roger Dingledine
734ba2f937
fix comment
2010-10-01 14:11:08 -04:00
Roger Dingledine
6cb5383e56
log when we guess our ip address, not just when we fail
2010-10-01 13:32:38 -04:00
Roger Dingledine
a00d48b4c3
Merge branch 'maint-0.2.2'
...
Conflicts:
configure.in
contrib/tor-mingw.nsi.in
src/win32/orconfig.h
2010-10-01 05:00:02 -04:00
Roger Dingledine
6e00877fa3
bump to 0.2.2.17-alpha-dev
2010-10-01 04:59:11 -04:00
Roger Dingledine
dd68c07dc3
retroactively declare the cbt fixes to be major
...
also put in release blurbs
2010-10-01 04:53:23 -04:00
Nick Mathewson
92640aa578
The build stuff for tor-fw-helper means we need automake 1.6 or later
2010-10-01 00:01:08 -04:00
Nick Mathewson
1b2120654c
Merge remote branch 'sebastian/fw-helper-manpage'
2010-09-30 22:24:18 -04:00
Roger Dingledine
5b7669130b
renumber, clean whitespace
2010-09-30 22:04:52 -04:00
Roger Dingledine
6de26d2bc8
give steven's everybody-a-bridge proposal a number
2010-09-30 22:04:52 -04:00
Steven Murdoch
60842424ae
Add comments from nickm and arma, from IRC
2010-09-30 22:04:52 -04:00
Steven Murdoch
2ba53aca76
Add algorithm and rationale for performance measurement
2010-09-30 22:04:52 -04:00
Steven Murdoch
df3911ded8
In the migration plan, mention how to prevent overloading the bridge authority
2010-09-30 22:04:52 -04:00
Steven Murdoch
ac55247350
Integrate more feedback from IRC
...
- For now we are only talking about moving clients to be bridges
- Some questions on how we should inform users
2010-09-30 22:04:52 -04:00
Steven Murdoch
d3d411533c
Add some open questions, and mention Roger's idea about asking for consent via email
2010-09-30 22:04:52 -04:00
Steven Murdoch
60d416a564
Note that we only can't handle automatic demotion. Users can always change their state manually.
2010-09-30 22:04:51 -04:00
Steven Murdoch
b112ecbcd9
Change "server" to "relay", so as to match existing terminology
2010-09-30 22:04:51 -04:00
Steven Murdoch
6008fcf863
Start idea xxx-automatic-node-promotion
...
- Initial draft of overview and motivation
- Start of design
2010-09-30 22:04:51 -04:00
Roger Dingledine
28b55c92d5
Merge branch 'maint-0.2.2'
2010-09-30 22:02:54 -04:00
Erinn Clark
dadd9608d2
improve rpm init script by borrowing from Debian
2010-09-30 21:48:29 -04:00
Erinn Clark
18b1097f28
Update rpm spec file so that it will build without manual intervention on all rpm-based distributions
2010-09-30 21:48:29 -04:00
Erinn Clark
951340f516
AUTHORS doesn't exist, so stop trying to cp it. Add 'sudo' to a mv that needs higher permissions.
2010-09-30 21:48:28 -04:00
Roger Dingledine
fe9402271a
Merge branch 'maint-0.2.2'
...
Conflicts:
configure.in
contrib/tor-mingw.nsi.in
src/win32/orconfig.h
2010-09-30 17:55:01 -04:00
Roger Dingledine
a3f488a887
bump to 0.2.2.17-alpha
2010-09-30 17:49:11 -04:00
Roger Dingledine
d62a2d6ee5
write up a changelog file
2010-09-30 17:32:17 -04:00
Sebastian Hahn
8264166259
Add more tor-fw-helper files to gitignore
2010-09-30 23:13:30 +02:00
Sebastian Hahn
d67bdddec5
Build the tor-fw-helper manpage
...
So far we just had the asciidoc manpage, but didn't build it.
2010-09-30 23:13:24 +02:00
Nick Mathewson
d2cca82b76
Add 'compile' to .gitignore
2010-09-30 16:41:12 -04:00
Nick Mathewson
495e630a49
Merge branch 'tor-fw-squashed2'
...
Conflicts:
src/common/util.c
2010-09-30 16:22:39 -04:00
Nick Mathewson
0e9d969bb2
Fix space and formatting issues
2010-09-30 15:55:42 -04:00
Nick Mathewson
d39e46c26d
Merge remote branch 'origin/maint-0.2.2'
2010-09-30 15:30:14 -04:00
Nick Mathewson
2835dcf69f
#if-out the fw-helper code in util.c when building on windows
2010-09-30 12:58:48 -04:00
Nick Mathewson
1779fee27a
Turn select() usage in tor-fw-helper into a function.
2010-09-30 12:18:21 -04:00
Steven Murdoch
a6dc00fa75
Start tor-fw-helper in the background, and log whatever it outputs
2010-09-30 11:40:37 -04:00
Jacob Appelbaum
3eaa9a376c
Changes to tor-fw-helper, some based on Nick's review
...
* MINIUPNPC rather than the generic UPNP
* Nick suggested a better abstraction model for tor-fw-helper
* Fix autoconf to build with either natpmp or miniupnpc
* Add AM_PROG_CC_C_O to fix automake complaint
* update spec to address nickm's concern
* refactor nat-pmp to match upnp state
* we prefer tor_snprintf to snprintf
* link properlty for tor_snprintf
* rename test_commandline_options to log_commandline_options
* cast this uint as an int
* detect possible FD_SETSIZE errors
* make note about future enhancements for natpmp
* add upnp enhancement note
* ChangeLog entry
* doxygen and check-spaces cleanup
* create tor-fw-helper.1.txt
2010-09-30 11:39:34 -04:00
Jacob Appelbaum
9cc76cf005
First implementation of tor-fw-helper.
...
tor-fw-helper is a command-line tool to wrap and abstract various
firewall port-forwarding tools.
This commit matches the state of Jacob's tor-fw-helper branch as of
23 September 2010.
(commit msg by Nick)
2010-09-30 11:37:53 -04:00
Nick Mathewson
3ad43ef75f
Whitespace fixes on recent merges to master.
2010-09-30 01:36:36 -04:00
Sebastian Hahn
5a19df1d94
Add a changes file for the bug1912 fix
2010-09-30 06:24:01 +02:00
Sebastian Hahn
0702429cf7
Note an XXX about potential overflow
2010-09-30 06:24:01 +02:00
Sebastian Hahn
73def430e3
Use an upper and lower bound for bridge weights
...
When picking bridges (or other nodes without a consensus entry (and
thus no bandwidth weights)) we shouldn't just trust the node's
descriptor. So far we believed anything between 0 and 10MB/s, where 0
would mean that a node doesn't get any use from use unless it is our
only one, and 10MB/s would be a quite siginficant weight. To make this
situation better, we now believe weights in the range from 20kB/s to
100kB/s. This should allow new bridges to get use more quickly, and
means that it will be harder for bridges to see almost all our traffic.
2010-09-30 06:17:54 +02:00
Sebastian Hahn
45c51e3238
Fix check-spaces
2010-09-30 06:17:32 +02:00
Roger Dingledine
ea6ac0f0d1
Merge branch 'maint-0.2.2'
2010-09-30 00:10:14 -04:00
Roger Dingledine
d17fcad3ae
Merge commit 'mikeperry/bug1772' into maint-0.2.2
2010-09-30 00:00:06 -04:00
Mike Perry
7eedd0f6bc
Nominaly lower the minimum timeout value to 1500.
...
This won't change any behavior, since it will still be rounded back
up to 2seconds, but should reduce the chances of some extra warns.
2010-09-29 20:58:09 -07:00
Roger Dingledine
3cbe463e96
Merge branch 'bug1772' into maint-0.2.2
2010-09-29 23:52:18 -04:00
Roger Dingledine
f2aa8f08cb
fix two casts
2010-09-29 23:51:25 -04:00
Mike Perry
c8f731fabb
Comment network liveness and change detection behavior.
2010-09-29 19:35:40 -07:00
Roger Dingledine
ceb3d4d578
no measurement circs if not enough build times
...
In the first 100 circuits, our timeout_ms and close_ms
are the same. So we shouldn't transition circuits to purpose
CIRCUIT_PURPOSE_C_MEASURE_TIMEOUT, since they will just timeout again
next time we check.
2010-09-29 18:05:10 -04:00
Roger Dingledine
7f10707c42
refactor and recomment; no actual changes
2010-09-29 18:01:22 -04:00
Roger Dingledine
355fc63790
Merge branch 'maint-0.2.2'
2010-09-29 17:21:43 -04:00
