Nick Mathewson
4c71be65d8
Merge remote branch 'origin/maint-0.2.2'
2010-10-04 13:56:17 -04:00
Robert Ransom
1b8c8059c7
Correct a bogus comment.
...
Whether or not OpenSSL reference-counts SSL_CTX objects is irrelevant;
what matters is that Tor reference-counts its wrapper objects for
SSL_CTXs.
2010-10-04 13:53:54 -04:00
Robert Ransom
c70d9d77ab
Correct a couple of log messages in tortls.c
2010-10-04 13:53:48 -04:00
Robert Ransom
068185eca2
Fix several comments in tortls.c
2010-10-04 13:47:57 -04:00
Nick Mathewson
64535a401b
Merge remote branch 'origin/maint-0.2.2'
2010-10-04 12:58:35 -04:00
Nick Mathewson
1fa50c778c
Clarify PublishServerDescriptor even more
2010-10-04 12:58:20 -04:00
Nick Mathewson
5eb3630f1a
Merge remote branch 'rransom/manpage-fixes' into maint-0.2.2
2010-10-04 12:56:05 -04:00
Nick Mathewson
3e5ada6a29
Merge remote branch 'origin/maint-0.2.2'
2010-10-04 12:32:52 -04:00
Nick Mathewson
69b4138c00
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
2010-10-04 12:32:35 -04:00
Karsten Loesing
bad609ae6b
Update to the October 1 2010 Maxmind GeoLite Country database.
2010-10-04 11:45:53 +02:00
Nick Mathewson
80b515b85f
Initialize fd values in tor_port_check_forwarding to -1
2010-10-01 18:14:17 -04:00
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
Robert Ransom
8d87040e13
Describe BridgeRelay and PublishServerDescriptor more correctly.
2010-09-30 23:43:19 -07: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
