nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 21:23:58 +01:00
Code Issues Packages Projects Releases Wiki Activity
13,247 Commits 53 Branches 630 Tags 125 MiB
8b686d98c4
Commit Graph

60 Commits

Author SHA1 Message Date
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
Roger Dingledine
2d6ee53fb9 stop shipping doc/img and doc/website in the tarball 2010-11-23 00:03:50 -05:00
Nick Mathewson
2b4ed1d07e Merge remote branch 'origin/maint-0.2.2' 
Conflicts:
	configure.in
 2010-11-11 13:59:18 -05:00
Sebastian Hahn
fcdf1470c0 Remove everything related to os x expert package 
We decided to no longer ship expert packages for OS X because they're a
lot of trouble to keep maintained and confuse users. For those who want
a tor on OS X without Vidalia, macports is a fine option. Alternatively,
building from source is easy, too.

The polipo stuff that is still required for the Vidalia bundle build can
now be found in the torbrowser repository,
git://git.torproject.org/torbrowser.git.
 2010-11-10 04:04:29 +01: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
Roger Dingledine
1ac1f048ef minor formatting / comment fixes 2010-08-13 17:18:45 -04:00
Linus Nordberg
0b96abe74f Bug #1773: Revert bad fix (4ef609b8) and do it properly. 
* doc/Makefile.am: Move $(VAR:MOD) expansions inside "if USE_ASCIIDOC".
* doc/Makefile.am: Use proper variable name for text input files.
* doc/Makefile.am: Initialize vars to empty when !USE_ASCIIDOC.
 2010-08-11 09:41:34 -04:00
Sebastian Hahn
ddf5020ea8 Fix 'make distcheck' 
We were leaving doc/config.log and src/or/micro-revision.i in
place during a make clean. Fix that.
 2010-08-03 00:48:59 +02:00
Linus Nordberg
4ef609b886 Fix compilation issue in doc/Makefile.am on NetBSD 
* doc/Makefile.am: Change $(VAR:MOD) to ${VAR:MOD} -- make(1) on
NetBSD substitutes '$(:x)' to 'x' rather than the empty string.  This
bites us in doc/ when configured with `--disable-asciidoc'.  Curly
braces should work in all implementations of make(1) but this patch
changes only the places where we use the VAR:MOD expansion.
 2010-07-30 11:34:52 -04:00
Sebastian Hahn
4db5e7ae76 Add configure switch to disable use of asciidoc 
Also break the build if that switch isn't used and asciidoc isn't
available.
 2010-03-01 05:02:27 +01:00
Sebastian Hahn
0cd1b499b4 Simplify asciidoc-helper 
We don't need sed for our string manipulation, so let's get rid of
it. Suggested by weasel.
 2010-03-01 04:07:55 +01:00
Sebastian Hahn
f9de12b864 Ship the asciidoc-helper file in our tarballs 
Otherwise, the build process breaks when one of the .1.txt gets
a new mtime. Suggested by weasel.
 2010-03-01 04:07:55 +01:00
Sebastian Hahn
e015fe8b09 Make sure docdir is defined when making doc/ 
Apparently some autoconf versions need this, while others don't.
This means documentation will be installed into share/doc/tor/.
 2010-01-28 09:03:21 +01:00
Sebastian Hahn
32c1863a67 Fix building the tarball 
This removes the Makefile.am from doc/design-paper and replaces it with
a static Makefile. We don't need to call it during the normal Tor build
process, as we don't need its targets normally. Keeping it around in
case we want to rebuild the pdf or ps files later.
 2010-01-28 09:03:21 +01:00
Sebastian Hahn
ca148f7219 Clean the man and html files with make (dist)clean 2010-01-27 20:23:13 +01:00
Sebastian Hahn
2c0ad636d9 Stop shipping the design paper in the tarballs 2010-01-27 20:09:19 +01:00
Nick Mathewson
e407c1adab Add a comment explaining the doc build system 
Updated a little by Sebastian
 2010-01-27 12:19:58 +01:00
Nick Mathewson
0c81d4c62b Make the asciidoc build process work from outside top_srcdir 
Edited a little by Sebastian
 2010-01-27 12:13:10 +01:00
Sebastian Hahn
a330cdc6fb Convert the Tor manpage to asciidoc. 
This should be a very faithful conversion, preserving as much of the layout
of the old manpage as possible. This wasn't possible for the nt-service
and the DataDirectory/state parts. See a later commit for some small
cleanups.

Tiago Faria helped with the asciidoc conversion, big thanks!
 2010-01-27 12:13:10 +01:00
Sebastian Hahn
ce860d8efd Convert the tor-resolve manpage to asciidoc 2010-01-27 12:13:10 +01:00
Sebastian Hahn
59a9908f66 Convert the torify manpage to asciidoc 2010-01-27 12:13:10 +01:00
Sebastian Hahn
2fc0c3031b Convert the tor-gencert manpage to asciidoc 2010-01-27 12:13:10 +01:00
Sebastian Hahn
9fe1c000b0 Allow generating documentation from asciidoc in the Makefile 2010-01-27 12:13:05 +01:00
Sebastian Hahn
3efadcd0d5 Move the torify manpage into the doc dir 2010-01-27 11:36:39 +01:00
Sebastian Hahn
f6a673490f Stop putting parts of the website into tarballs. 
The website wasn't used by our packages, and most users will not know how
to open html.en files anyways.
 2010-01-27 11:36:39 +01:00
Roger Dingledine
b4b3472b9f Make the tor-gencert man page get included correctly in the tarball. 
svn:r13163
 2008-01-17 20:32:37 +00:00
Nick Mathewson
c508fa5aec r17550@catbus: nickm | 2008-01-10 12:08:01 -0500 
Add a manual page for tor-gencert.  Also implement the missing -s option in tor-gencert, and fix the info message for when no cert file is specified.


svn:r13091
 2008-01-10 17:08:05 +00:00
Roger Dingledine
2f6ec3d63e sacrifice another chicken so the spec files can be in the tarball 
svn:r9424
 2007-01-26 09:12:52 +00:00
Nick Mathewson
489f6185bf Move specification documents into new doc/spec subdirectory. (Proposals, drafts, and bad ideas still remain in doc.) 
svn:r9411
 2007-01-26 01:59:50 +00:00
Nick Mathewson
1ce86f1fca r11644@Kushana: nickm | 2006-12-19 14:07:17 -0500 
Add address-spec.txt document to describe .exit, .onion, and .noconnnect.  Hopefully, we will not add too many of these just because we have a file for them now...


svn:r9155
 2006-12-19 19:48:54 +00:00
Roger Dingledine
e63211fad3 add tor-win32-mingw-creation.txt to the tarball too 
svn:r8627
 2006-10-07 01:37:23 +00:00
Roger Dingledine
6e6b821a71 start shipping path-spec.txt in the tarball 
svn:r8626
 2006-10-07 01:32:25 +00:00
Roger Dingledine
c8b053ba87 packages now start including svn website docs (oops) 
svn:r8340
 2006-09-07 03:40:23 +00:00
Roger Dingledine
bf76d3a189 forward-port the website hack. note that with svn, our build 
system seems to build in-place, so the website/ and img/ directories
actually get created in my sandbox. poo.


svn:r6944
 2006-07-30 04:45:59 +00:00
Roger Dingledine
9deee4c60f exclude the website images from the tarball. they're huge. 
we need to figure out some other solution than shipping the
whole pile of screenshots.


svn:r6352
 2006-04-10 07:04:43 +00:00
Roger Dingledine
b0a502df59 hack together a shell blob so 'make dist' can build even when 
the website isn't there.


svn:r6288
 2006-04-02 03:42:32 +00:00
Peter Palfrader
b13c1b53c6 Fail somehow smarter if we do not have the website source tree in ../website 
svn:r6278
 2006-03-31 05:00:28 +00:00
Peter Palfrader
fef8829d3c This works better for me. Does it still work for you? 
svn:r6277
 2006-03-31 04:54:03 +00:00
Roger Dingledine
f41d3abb41 weasel suggests that this will help. 
svn:r6276
 2006-03-31 04:30:13 +00:00
Roger Dingledine
3e2f1c8bb8 A start at copying the website tor-*.html and images into 
the tarball. Weasel, can you help make the dependencies cause
these to get re-built appropriately?


svn:r6275
 2006-03-31 04:23:41 +00:00
Andrew Lewman
0dd04f7966 Add tor-osx-dmg-creation.txt and tor-rpm-creation.txt for distribution 
svn:r6068
 2006-02-21 04:54:24 +00:00
Roger Dingledine
fc2522dd02 and don't ship it either 
svn:r6022
 2006-02-16 17:45:50 +00:00
Roger Dingledine
386e3954ae put the socks-extensions file in the tarball too 
svn:r5401
 2005-11-17 00:00:49 +00:00
Roger Dingledine
ed6a0531d2 and get it into the tarball 
svn:r5396
 2005-11-15 22:42:25 +00:00
Roger Dingledine
3ec1aea329 stop shipping tor-doc.html and .css in the tarball 
they're obsolete


svn:r5394
 2005-11-15 22:39:55 +00:00
Roger Dingledine
2a96454816 start shipping tor-doc-unix.html tor-doc-server.html in the tarball 
svn:r5393
 2005-11-15 22:39:23 +00:00
Roger Dingledine
b31160449c start shipping tor-doc-win32.html tor-doc-osx.html tor-switchproxy.html 
tor-hidden-service.html in the tarball too


svn:r4664
 2005-07-25 03:01:18 +00:00
Roger Dingledine
e35256f45c remove CLIENTS file, since it has been replaced with 
http://wiki.noreply.org/noreply/TheOnionRouter/TorFAQ#SOCKSAndDNS


svn:r4473
 2005-06-21 20:18:20 +00:00