~ubuntu-branches/ubuntu/trusty/tor/trusty-proposed

« back to all changes in this revision

Viewing changes to src/config/torrc.sample.in

Committer: Package Import Robot
Author(s): Peter Palfrader
Date: 2013-12-12 14:31:32 UTC
mfrom: (1.5.25) (2.1.82 experimental)
Revision ID: package-import@ubuntu.com-20131212143132-zjz1rgameoxts5t0

Tags: 0.2.4.19-1

New upstream version.

files added:
configure.ac

contrib/include.am

contrib/suse/include.am

debian/patches/improve-geoip-warning

debian/patches/series

debian/source.lintian-overrides

debian/tor-dbg.lintian-overrides

debian/tor-geoipdb.install

debian/tor-geoipdb.lintian-overrides

debian/tor.install

debian/tor.links

debian/tor.lintian-overrides

debian/tor.maintscript

doc/include.am

m4/ax_check_sign.m4

micro-revision.i

src/common/crypto_curve25519.c

src/common/crypto_curve25519.h

src/common/crypto_format.c

src/common/include.am

src/config/geoip6

src/config/include.am

src/ext

src/ext/OpenBSD_malloc_Linux.c

src/ext/README

src/ext/curve25519_donna

src/ext/curve25519_donna/curve25519-donna-c64.c

src/ext/curve25519_donna/curve25519-donna.c

src/ext/eventdns.c

src/ext/eventdns.h

src/ext/ht.h

src/ext/include.am

src/ext/strlcat.c

src/ext/strlcpy.c

src/ext/tinytest.c

src/ext/tinytest.h

src/ext/tinytest_macros.h

src/ext/tor_queue.h

src/include.am

src/or/addressmap.c

src/or/addressmap.h

src/or/channel.c

src/or/channel.h

src/or/channeltls.c

src/or/channeltls.h

src/or/circuitmux.c

src/or/circuitmux.h

src/or/circuitmux_ewma.c

src/or/circuitmux_ewma.h

src/or/circuitstats.c

src/or/circuitstats.h

src/or/confparse.c

src/or/confparse.h

src/or/entrynodes.c

src/or/entrynodes.h

src/or/fp_pair.c

src/or/fp_pair.h

src/or/include.am

src/or/onion_fast.c

src/or/onion_fast.h

src/or/onion_ntor.c

src/or/onion_ntor.h

src/or/onion_tap.c

src/or/onion_tap.h

src/or/replaycache.c

src/or/replaycache.h

src/or/routerset.c

src/or/routerset.h

src/or/statefile.c

src/or/statefile.h

src/test/include.am

src/test/test_cell_formats.c

src/test/test_introduce.c

src/test/test_ntor_cl.c

src/test/test_replay.c

src/tools/include.am

src/tools/tor-fw-helper/include.am

src/win32/include.am

files removed:
configure.in

contrib/Makefile.am

contrib/Makefile.in

contrib/suse/Makefile.am

contrib/suse/Makefile.in

contrib/tor-tsocks.conf

debian/TODO

debian/patches/00list

debian/patches/02_add_debian_files_in_manpage.dpatch

debian/patches/03_tor_manpage_in_section_8.dpatch

debian/patches/14_fix_geoip_warning.dpatch

debian/tor-geoipdb.dirs

debian/tor-geoipdb.lintian-override

doc/Makefile.am

doc/Makefile.in

doc/TODO

doc/spec

doc/spec/README

doc/tor-rpm-creation.txt

doc/tor-win32-mingw-creation.txt

src/Makefile.am

src/Makefile.in

src/common/Makefile.am

src/common/Makefile.in

src/common/OpenBSD_malloc_Linux.c

src/common/ht.h

src/common/sha256.c

src/common/strlcat.c

src/common/strlcpy.c

src/config/Makefile.am

src/config/Makefile.in

src/or/Makefile.am

src/or/Makefile.in

src/or/eventdns.c

src/or/eventdns.h

src/or/micro-revision.i

src/test/Makefile.am

src/test/Makefile.in

src/test/tinytest.c

src/test/tinytest.h

src/test/tinytest_macros.h

src/tools/Makefile.am

src/tools/Makefile.in

src/tools/tor-fw-helper/Makefile.am

src/tools/tor-fw-helper/Makefile.in

src/win32/Makefile.am

src/win32/Makefile.in

tor.spec

tor.spec.in

files modified:
ChangeLog

LICENSE

Makefile.am

Makefile.in

Makefile.nmake

ReleaseNotes

acinclude.m4

aclocal.m4

configure

contrib/tor-mingw.nsi.in

contrib/tor.nsi.in

debian/changelog

debian/compat

debian/control

debian/copyright

debian/micro-revision.i

debian/rules

debian/tor.apparmor-profile.abstraction

debian/tor.default

debian/tor.dirs

debian/tor.init

debian/watch

doc/HACKING

doc/asciidoc-helper.sh

doc/tor-fw-helper.1.in

doc/tor-fw-helper.1.txt

doc/tor-fw-helper.html.in

doc/tor-gencert.1.in

doc/tor-gencert.1.txt

doc/tor-gencert.html.in

doc/tor-resolve.1.in

doc/tor-resolve.1.txt

doc/tor-resolve.html.in

doc/tor.1.in

doc/tor.1.txt

doc/tor.html.in

doc/torify.1.in

doc/torify.1.txt

doc/torify.html.in

orconfig.h.in

src/common/Makefile.nmake

src/common/address.c

src/common/address.h

src/common/aes.c

src/common/aes.h

src/common/common_sha1.i

src/common/compat.c

src/common/compat.h

src/common/compat_libevent.c

src/common/compat_libevent.h

src/common/container.c

src/common/container.h

src/common/crypto.c

src/common/crypto.h

src/common/di_ops.c

src/common/di_ops.h

src/common/log.c

src/common/memarea.c

src/common/memarea.h

src/common/mempool.c

src/common/mempool.h

src/common/procmon.c

src/common/procmon.h

src/common/torgzip.c

src/common/torgzip.h

src/common/torint.h

src/common/torlog.h

src/common/tortls.c

src/common/tortls.h

src/common/util.c

src/common/util.h

src/config/geoip

src/config/torrc.sample.in

src/or/Makefile.nmake

src/or/buffers.c

src/or/buffers.h

src/or/circuitbuild.c

src/or/circuitbuild.h

src/or/circuitlist.c

src/or/circuitlist.h

src/or/circuituse.c

src/or/circuituse.h

src/or/command.c

src/or/command.h

src/or/config.c

src/or/config.h

src/or/connection.c

src/or/connection.h

src/or/connection_edge.c

src/or/connection_edge.h

src/or/connection_or.c

src/or/connection_or.h

src/or/control.c

src/or/control.h

src/or/cpuworker.c

src/or/cpuworker.h

src/or/directory.c

src/or/directory.h

src/or/dirserv.c

src/or/dirserv.h

src/or/dirvote.c

src/or/dirvote.h

src/or/dns.c

src/or/dns.h

src/or/dnsserv.c

src/or/dnsserv.h

src/or/eventdns_tor.h

src/or/geoip.c

src/or/geoip.h

src/or/hibernate.c

src/or/hibernate.h

src/or/main.c

src/or/main.h

src/or/microdesc.c

src/or/microdesc.h

src/or/networkstatus.c

src/or/networkstatus.h

src/or/nodelist.c

src/or/nodelist.h

src/or/ntmain.c

src/or/ntmain.h

src/or/onion.c

src/or/onion.h

src/or/or.h

src/or/or_sha1.i

src/or/policies.c

src/or/policies.h

src/or/reasons.c

src/or/reasons.h

src/or/relay.c

src/or/relay.h

src/or/rendclient.c

src/or/rendclient.h

src/or/rendcommon.c

src/or/rendcommon.h

src/or/rendmid.c

src/or/rendmid.h

src/or/rendservice.c

src/or/rendservice.h

src/or/rephist.c

src/or/rephist.h

src/or/router.c

src/or/router.h

src/or/routerlist.c

src/or/routerlist.h

src/or/routerparse.c

src/or/routerparse.h

src/or/status.c

src/or/status.h

src/or/tor_main.c

src/or/transports.c

src/or/transports.h

src/test/bench.c

src/test/test-child.c

src/test/test.c

src/test/test.h

src/test/test_addr.c

src/test/test_config.c

src/test/test_containers.c

src/test/test_crypto.c

src/test/test_data.c

src/test/test_dir.c

src/test/test_microdesc.c

src/test/test_pt.c

src/test/test_util.c

src/tools/tor-checkkey.c

src/tools/tor-fw-helper/tor-fw-helper-natpmp.c

src/tools/tor-fw-helper/tor-fw-helper-natpmp.h

src/tools/tor-fw-helper/tor-fw-helper-upnp.c

src/tools/tor-fw-helper/tor-fw-helper-upnp.h

src/tools/tor-fw-helper/tor-fw-helper.c

src/tools/tor-fw-helper/tor-fw-helper.h

src/tools/tor-gencert.c

src/tools/tor-resolve.c

src/win32/orconfig.h

Show diffs side-by-side

added added

removed removed

src/config/torrc.sample.in

## Configuration file for a typical Tor user

## Last updated 22 April 2012 for Tor 0.2.3.14-alpha.

## Last updated 12 September 2012 for Tor 0.2.4.3-alpha.

## (may or may not work for much older or much newer versions of Tor.)

## Lines that begin with "## " try to explain what's going on. Lines

## configure one below. Set "SocksPort 0" if you plan to run Tor only

## as a relay, and not make any local application connections yourself.

#SocksPort 9050 # Default: Bind to localhost:9050 for local connections.

#SocksPort 192.168.0.1:9100 # Bind to this adddress:port too.

#SocksPort 192.168.0.1:9100 # Bind to this address:port too.

## Entry policies to allow/deny SOCKS requests based on IP address.

## First entry that matches wins. If no SocksPolicy is set, we accept

Older »