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
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
Nick Mathewson
b99a8d5427
Merge remote branch 'origin/maint-0.2.2'
...
Conflicts:
doc/spec/Makefile.am
doc/spec/control-spec.txt
doc/spec/dir-spec.txt
doc/spec/proposals/000-index.txt
doc/spec/proposals/001-process.txt
doc/spec/proposals/ideas/xxx-encrypted-services.txt
2011-02-21 16:10:31 -05:00
Nick Mathewson
d673479eba
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
...
Conflicts:
doc/Makefile.am
doc/spec/Makefile.am
doc/spec/address-spec.txt
doc/spec/bridges-spec.txt
doc/spec/control-spec-v0.txt
doc/spec/control-spec.txt
doc/spec/dir-spec-v1.txt
doc/spec/dir-spec-v2.txt
doc/spec/dir-spec.txt
doc/spec/path-spec.txt
doc/spec/proposals/000-index.txt
doc/spec/proposals/001-process.txt
doc/spec/proposals/098-todo.txt
doc/spec/proposals/099-misc.txt
doc/spec/proposals/100-tor-spec-udp.txt
doc/spec/proposals/101-dir-voting.txt
doc/spec/proposals/102-drop-opt.txt
doc/spec/proposals/103-multilevel-keys.txt
doc/spec/proposals/104-short-descriptors.txt
doc/spec/proposals/105-handshake-revision.txt
doc/spec/proposals/106-less-tls-constraint.txt
doc/spec/proposals/107-uptime-sanity-checking.txt
doc/spec/proposals/108-mtbf-based-stability.txt
doc/spec/proposals/109-no-sharing-ips.txt
doc/spec/proposals/110-avoid-infinite-circuits.txt
doc/spec/proposals/111-local-traffic-priority.txt
doc/spec/proposals/112-bring-back-pathlencoinweight.txt
doc/spec/proposals/113-fast-authority-interface.txt
doc/spec/proposals/114-distributed-storage.txt
doc/spec/proposals/115-two-hop-paths.txt
doc/spec/proposals/116-two-hop-paths-from-guard.txt
doc/spec/proposals/117-ipv6-exits.txt
doc/spec/proposals/118-multiple-orports.txt
doc/spec/proposals/119-controlport-auth.txt
doc/spec/proposals/120-shutdown-descriptors.txt
doc/spec/proposals/121-hidden-service-authentication.txt
doc/spec/proposals/122-unnamed-flag.txt
doc/spec/proposals/123-autonaming.txt
doc/spec/proposals/124-tls-certificates.txt
doc/spec/proposals/125-bridges.txt
doc/spec/proposals/126-geoip-reporting.txt
doc/spec/proposals/127-dirport-mirrors-downloads.txt
doc/spec/proposals/128-bridge-families.txt
doc/spec/proposals/129-reject-plaintext-ports.txt
doc/spec/proposals/130-v2-conn-protocol.txt
doc/spec/proposals/131-verify-tor-usage.txt
doc/spec/proposals/132-browser-check-tor-service.txt
doc/spec/proposals/134-robust-voting.txt
doc/spec/proposals/135-private-tor-networks.txt
doc/spec/proposals/137-bootstrap-phases.txt
doc/spec/proposals/138-remove-down-routers-from-consensus.txt
doc/spec/proposals/140-consensus-diffs.txt
doc/spec/proposals/141-jit-sd-downloads.txt
doc/spec/proposals/142-combine-intro-and-rend-points.txt
doc/spec/proposals/143-distributed-storage-improvements.txt
doc/spec/proposals/145-newguard-flag.txt
doc/spec/proposals/146-long-term-stability.txt
doc/spec/proposals/147-prevoting-opinions.txt
doc/spec/proposals/148-uniform-client-end-reason.txt
doc/spec/proposals/149-using-netinfo-data.txt
doc/spec/proposals/150-exclude-exit-nodes.txt
doc/spec/proposals/151-path-selection-improvements.txt
doc/spec/proposals/152-single-hop-circuits.txt
doc/spec/proposals/153-automatic-software-update-protocol.txt
doc/spec/proposals/154-automatic-updates.txt
doc/spec/proposals/155-four-hidden-service-improvements.txt
doc/spec/proposals/156-tracking-blocked-ports.txt
doc/spec/proposals/157-specific-cert-download.txt
doc/spec/proposals/158-microdescriptors.txt
doc/spec/proposals/159-exit-scanning.txt
doc/spec/proposals/ideas/xxx-hide-platform.txt
doc/spec/proposals/ideas/xxx-port-knocking.txt
doc/spec/proposals/ideas/xxx-separate-streams-by-port.txt
doc/spec/proposals/ideas/xxx-what-uses-sha1.txt
doc/spec/proposals/reindex.py
doc/spec/rend-spec.txt
doc/spec/socks-extensions.txt
doc/spec/tor-spec.txt
doc/spec/version-spec.txt
2011-02-21 16:09:23 -05:00
Nick Mathewson
7bdb7d4811
Remove specs from 0.2.1 branch: they have moved to a new repository.
2011-02-21 16:02:16 -05:00
Jacob Appelbaum
2f36489422
latest revision of cert normalization spec
2011-02-21 13:45:57 -05:00
Nick Mathewson
0a69355794
Add fixed string and nonce to prop 176 at suggestion from agl
2011-02-21 13:45:00 -05:00
Jacob Appelbaum
400a5a7ddd
Add TLS/cert normalization spec draft
2011-02-18 16:04:23 -05:00
Jacob Appelbaum
38224f95a6
Quick patch to pluggable transport spec
2011-02-18 16:03:31 -05:00
Nick Mathewson
c1c8f51d77
Add proposal 177: Abstaining from votes on individual flags
2011-02-14 14:22:30 -05:00
Roger Dingledine
6ce217731c
get a proposal i started last month into git
2011-02-14 05:59:43 -05:00
Nick Mathewson
c79a24f505
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-02-10 16:01:29 -05:00
Nick Mathewson
d37660d3f3
Merge remote-tracking branch 'rransom/bug2089' into maint-0.2.2
2011-02-10 16:01:19 -05:00
Nick Mathewson
f1a004797e
Merge remote-tracking branch 'origin/maint-0.2.2'
...
Conflicts:
doc/tor.1.txt
2011-02-10 15:52:04 -05:00
Robert Ransom
6f07363e72
Document what descriptors HSAuthoritativeDir serves
...
Fixes bug 2089.
2011-02-10 11:06:05 -08:00
Robert Ransom
20d493308a
Update documentation for PublishServerDescriptor (0.2.2.x)
2011-02-09 03:20:43 -08:00
Robert Ransom
5fc6967956
Update documentation for PublishServerDescriptor
2011-02-09 02:33:24 -08:00
Nick Mathewson
3bcba6d716
Merge remote branch 'origin/maint-0.2.2'
2011-02-07 12:51:34 -05:00
