Nick Mathewson
4ac8ff9c9f
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-05-15 20:22:44 -04:00
Sebastian Hahn
4198261291
Clean up the 2972 implementation a little
2011-05-15 20:20:28 -04:00
Jérémy Bobbio
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
Nick Mathewson
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
Nick Mathewson
7f654a6a6f
Add a ControlPortFileGroupWritable option
2011-05-13 10:41:29 -04:00
Nick Mathewson
dad12188a6
Write automatically-chosen control ports to a file.
2011-05-13 10:41:28 -04:00
Nick Mathewson
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
Nick Mathewson
8fa7bcead5
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-05-12 11:36:41 -04:00
Nick Mathewson
2c88dd7f95
Clean up a formatting issue on the manpge; bug3154.
2011-05-12 11:36:20 -04:00
Roger Dingledine
6d5478a8a7
Merge branch 'maint-0.2.2'
2011-05-10 23:06:12 -04:00
Roger Dingledine
ec25c1f6ca
another changelog heuristic based on 0.2.3.1-alpha
2011-05-10 21:30:55 -04:00
Nick Mathewson
e6980faec4
Merge remote-tracking branch 'origin/maint-0.2.2'
...
Conflicts:
src/or/directory.c
2011-05-09 13:39:51 -04:00
Nick Mathewson
09d7af7789
Merge remote-tracking branch 'public/bug3022_v2' into maint-0.2.2
2011-05-09 13:37:56 -04:00
Nick Mathewson
1065a5ef29
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-05-05 21:54:04 -04:00
Andrew Lewman
be7e8f5bb9
fix the website directions.
2011-05-05 15:28:29 -04:00
Nick Mathewson
4c9bd06d0d
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-05-04 17:38:33 -04:00
Nick Mathewson
0ee524b57f
Merge branch 'bug2379' into maint-0.2.2
2011-05-04 17:37:56 -04:00
Nick Mathewson
699af20e9a
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-05-04 17:21:44 -04:00
Nick Mathewson
29f1ffa0fe
More notes on how to upload tarballs from erinn
2011-05-04 17:21:33 -04:00
Nick Mathewson
b04dca448d
Add some missing torrc entries to tor.1.txt
...
Fixes bug 2379
2011-05-03 22:14:40 -04:00
Nick Mathewson
27b3b7aa58
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-05-02 20:18:28 -04:00
Nick Mathewson
033c27ac5e
Add a couple of notes to doc/HACKING based on 0.2.2.25-alpha process
2011-05-02 16:55:50 -04:00
Nick Mathewson
c48d6da24c
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-04-29 11:15:11 -04:00
Roger Dingledine
93b0183d3c
add another heuristic for changes stanzas
2011-04-29 01:35:21 -04:00
Nick Mathewson
676190e895
Update hacking file with terse notes on formatting changelog
2011-04-28 23:44:48 -04:00
Nick Mathewson
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
Nick Mathewson
78c610eea9
Merge remote-tracking branch 'origin/maint-0.2.2'
...
Conflicts:
doc/tor.1.txt
2011-04-27 15:20:01 -04:00
Nick Mathewson
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
Roger Dingledine
0f48e8fa9a
minor tweaks to manpage
2011-04-27 14:04:50 -04:00
Nick Mathewson
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
Nick Mathewson
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
Nick Mathewson
4740311d18
Merge remote branch 'origin/maint-0.2.2'
2011-03-10 16:11:39 -05:00
Nick Mathewson
48c4d53281
Add a step to the release process: tell trac about the version.
2011-03-10 16:10:53 -05:00
Roger Dingledine
cb3c3c63cb
Merge branch 'maint-0.2.2'
2011-03-08 16:14:53 -05:00
Nick Mathewson
f9bb3ced51
Merge remote branch 'origin/maint-0.2.2'
...
Resolved trivial one-line conflicts.
Conflicts:
src/or/dirserv.c
src/or/rephist.c
2011-03-08 16:10:40 -05:00
Roger Dingledine
dbd4a01756
steps roger takes when making a new release
2011-03-08 16:06:32 -05:00
Roger Dingledine
9c72324ae8
update spec locations
2011-03-08 15:31:04 -05:00
Nick Mathewson
d5907e7d9d
Merge remote branch 'origin/maint-0.2.2'
2011-03-08 15:23:30 -05:00
Roger Dingledine
95edd51116
make nickm's proposed convention from 2003 be gospel
2011-03-08 14:59:30 -05:00
Nick Mathewson
c6d8e75dc3
Merge remote branch 'origin/maint-0.2.2'
2011-03-04 00:25:14 -05:00
Robert Ransom
88e0de9ebb
Fix typo in man page
2011-03-03 10:41:39 -08:00
Nick Mathewson
f16178c08f
Merge remote branch 'origin/maint-0.2.2'
2011-02-22 18:25:16 -05:00
Nick Mathewson
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
Roger Dingledine
108f48dfc7
Merge branch 'maint-0.2.2'
2011-02-22 14:44:32 -05:00
Roger Dingledine
4f730e4f3f
Merge branch 'maint-0.2.1' into maint-0.2.2
2011-02-22 14:44:09 -05:00
Roger Dingledine
0ab62a4dc5
prefer https urls
2011-02-22 14:39:09 -05:00
Nick Mathewson
46b07462ae
Merge remote branch 'origin/maint-0.2.2'
2011-02-22 13:02:42 -05:00
Nick Mathewson
9d5873cdae
Merge branch 'log_domains' into maint-0.2.2
2011-02-22 13:01:02 -05:00
George Kadianakis
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
Sebastian Hahn
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