0e4f5e7cb1
fix default for TokenBucketRefillInterval in man page
2011-09-28 18:23:17 -04:00
41dfc4c19c
Make bufferevents work with TokenBucketRefillInterval
2011-09-22 15:07:34 -04:00
1e61184628
Make documentation for TokenBucketRefillInterval match its behavior
2011-09-22 15:07:34 -04:00
6b1d8321ae
New torrc option to allow bucket refill intervals of less than 1 sec
...
Implements bug3630.
2011-09-22 15:07:23 -04:00
41eef6680e
Merge remote-tracking branch 'origin/maint-0.2.2'
...
Conflicts:
src/or/dirserv.c
src/or/networkstatus.c
Conflicts were related to routerinfo->node shift.
2011-09-07 14:51:55 -04:00
dfa6cde4d4
Merge remote-tracking branch 'public/bug2649_squashed' into maint-0.2.2
2011-09-07 14:43:06 -04:00
fe0fa91164
Merge branch 'maint-0.2.2'
2011-09-02 07:23:37 -04:00
e0dae64449
Correct man page: multiple control auth styles can be set at once
2011-09-02 07:01:55 -04:00
372262b458
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-08-25 18:55:28 -04:00
cc33ac362b
Mention that HiddenServiceDir must exist
2011-08-25 22:26:54 +02:00
6e923ed8cd
Add an OptimisticData option to control client-side optimistic data
2011-07-20 14:14:21 -04:00
12dfb4f5d8
Use socks username/password information in stream isolation
2011-07-19 02:44:12 -04:00
891ccd3cd0
Manpage updates for proposal 171 (isolated streams)
2011-07-19 02:02:18 -04:00
eee942c5be
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-07-06 10:56:47 -04:00
1a016c9233
Fix weird formatting of html manpage
...
Asciidoc was inserting <pre> tags for paragraphs that started with a
'+' at the beginning of the line. Instead, we need a space in front of
the plus.
2011-07-06 10:47:06 +02:00
8b265543eb
Add port 6523 (Gobby) to LongLivedPorts.
2011-06-20 12:08:46 -04:00
a046966baf
Merge remote-tracking branch 'origin/maint-0.2.2'
...
Conflicts:
src/or/config.c
src/or/or.h
2011-06-19 21:00:15 -04:00
cabb16caa9
Revert "Update man page for new UseBridges tristate behaviour."
...
This reverts commit 40cfad1b5a
2011-06-17 16:45:23 -04:00
f45261cb29
Increase default required uptime for HSDirs to 25 hours
2011-06-03 12:17:53 -04:00
1546054d81
Add a VoteOnHidServDirectoriesV2 configuration option
2011-06-03 12:16:55 -04:00
13ec1bf5c2
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-06-03 10:47:35 -04:00
40cfad1b5a
Update man page for new UseBridges tristate behaviour.
2011-06-02 15:11:21 -04:00
4ac8ff9c9f
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-05-15 20:22:44 -04:00
4198261291
Clean up the 2972 implementation a little
2011-05-15 20:20:28 -04:00
d41ac64ad6
Add UnixSocketsGroupWritable config flag
...
When running a system-wide instance of Tor on Unix-like systems, having
a ControlSocket is a quite handy mechanism to access Tor control
channel. But it would be easier if access to the Unix domain socket can
be granted by making control users members of the group running the Tor
process.
This change introduces a UnixSocketsGroupWritable option, which will
create Unix domain sockets (and thus ControlSocket) 'g+rw'. This allows
ControlSocket to offer same access control measures than
ControlPort+CookieAuthFileGroupReadable.
See <http://bugs.debian.org/552556 > for more details.
2011-05-15 20:20:28 -04:00
600744b4be
Merge remote-tracking branch 'origin/maint-0.2.2'
...
Conflicts:
src/or/config.c
src/or/dirserv.c
src/or/or.h
2011-05-13 10:48:07 -04:00
7f654a6a6f
Add a ControlPortFileGroupWritable option
2011-05-13 10:41:29 -04:00
dad12188a6
Write automatically-chosen control ports to a file.
2011-05-13 10:41:28 -04:00
5fec8fe559
"(Socks|Control|etc)Port auto" now tells Tor to open an arbitrary port
...
This is the major part of the implementation for trac issue 3076.
2011-05-13 10:41:18 -04:00
8fa7bcead5
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-05-12 11:36:41 -04:00
2c88dd7f95
Clean up a formatting issue on the manpge; bug3154.
2011-05-12 11:36:20 -04:00
e6980faec4
Merge remote-tracking branch 'origin/maint-0.2.2'
...
Conflicts:
src/or/directory.c
2011-05-09 13:39:51 -04:00
09d7af7789
Merge remote-tracking branch 'public/bug3022_v2' into maint-0.2.2
2011-05-09 13:37:56 -04:00
4c9bd06d0d
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-05-04 17:38:33 -04:00
b04dca448d
Add some missing torrc entries to tor.1.txt
...
Fixes bug 2379
2011-05-03 22:14:40 -04:00
cd42ae7185
Only authorities should automatically download v2 networkstatus documents
...
Clients and relays haven't used them since early 0.2.0.x. The only
remaining use by authorities learning about new relays ahead of scedule;
see proposal 147 for what we intend to do about that.
We're leaving in an option (FetchV2Networkstatus) to manually fetch v2
networkstatuses, because apparently dnsel and maybe bwauth want them.
This fixes bug 3022.
2011-04-28 21:06:07 -04:00
78c610eea9
Merge remote-tracking branch 'origin/maint-0.2.2'
...
Conflicts:
doc/tor.1.txt
2011-04-27 15:20:01 -04:00
8b686d98c4
Merge maint-0.2.2 for the bug1090-part1-squashed branch
...
Resolved conflicts in:
doc/tor.1.txt
src/or/circuitbuild.c
src/or/circuituse.c
src/or/connection_edge.c
src/or/connection_edge.h
src/or/directory.c
src/or/rendclient.c
src/or/routerlist.c
src/or/routerlist.h
These were mostly releated to the routerinfo_t->node_t conversion.
2011-04-27 14:36:30 -04:00
0f48e8fa9a
minor tweaks to manpage
2011-04-27 14:04:50 -04:00
2ac768e89f
Revise the manpage to contain the actual intended *Nodes behavior
...
This is a squashed version of my former desired_nodes_behavior branch
that we used to specify the intended results wrt bug 1090.
2011-04-27 13:39:22 -04:00
1a49fdecf8
Tweaks to Cagara's CountPrivateBandwidth patch:
...
- Document it in the manpage
- Add a changes entry
- No need to log when it is set: we don't log for other options.
- Use doxygen to document the new flag.
- Test truth of C variables with "if (x)", not "if (x == 1)".
- Simplify a complex boolean expression by breaking it up.
2011-04-05 16:24:42 -04:00
c6d8e75dc3
Merge remote branch 'origin/maint-0.2.2'
2011-03-04 00:25:14 -05:00
88e0de9ebb
Fix typo in man page
2011-03-03 10:41:39 -08:00
f16178c08f
Merge remote branch 'origin/maint-0.2.2'
2011-02-22 18:25:16 -05:00
530e87ce31
Add some dollar signs in an attempt to appease older asciidocs
...
We should really require a modern asiidoc: backporting stuff to 8.2 is
a timesink.
2011-02-22 18:24:33 -05:00
46b07462ae
Merge remote branch 'origin/maint-0.2.2'
2011-02-22 13:02:42 -05:00
9d5873cdae
Merge branch 'log_domains' into maint-0.2.2
2011-02-22 13:01:02 -05:00
ee95430d39
Implement more heartbeat message stuff.
...
(This squashes multiple commits:
* Adds uptime monitoring support.
* Adds circuit counting code.
* Trivially tweaks the documentation.
* Trivial run_scheduled_events() code tweaking.
* Adds a status.h to export functions.
* Added bandwidth monitoring code.
* Added consensus presense detection code.
* Restricts the precision of the bandwidth output.
* Various fixes.
* Fixed style and spacing problems.
* Tidied up src/or/Makefile.am
* Couple of minor fixes on status.c functions.
* 'Implemented' client heartbeat support
)
2011-02-22 12:40:38 -05:00
098b6ba72d
Initial heartbeat subsystem commit.
...
Sets:
* Documentation
* Logging domain
* Configuration option
* Scheduled event
* Makefile
It also creates status.c and the log_heartbeat() function.
All code was written by Sebastian Hahn. Commit message was
written by me (George Kadianakis).
2011-02-22 12:40:36 -05:00
c79a24f505
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-02-10 16:01:29 -05:00
Roger Dingledine
Nick Mathewson
Florian Tschorsch
Sebastian Hahn
intrigeri
Robert Ransom
anonym
Jérémy Bobbio
George Kadianakis