Commit Graph

12054 Commits

Author SHA1 Message Date
Sebastian Hahn 2d8db2aacb Fix url in rend-spec
Fixes bug 1822
2010-08-12 02:40:19 +02:00
Chris Ball 16970d83cc doc/HACKING: Explain how to find when a given change was introduced 2010-08-12 02:38:58 +02:00
Sebastian Hahn 28962ecae8 Fix a typo in control-spec 2010-08-12 02:38:58 +02:00
Nick Mathewson 1cf19b5046 Merge branch 'build-wo-asciidoc-on-bsd' 2010-08-11 09:42:05 -04:00
Linus Nordberg 5b69cf85fa Fix changes/ file for bug #1773. 2010-08-11 09:41:51 -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
Roger Dingledine 863b6c439e changelog entry for f060b18e6c 2010-08-11 02:11:05 -04:00
Roger Dingledine 267c976405 fold in most of the changes/foo files 2010-08-11 01:51:41 -04:00
Roger Dingledine 45c6b5de17 tiny change i found in my other sandbox 2010-08-11 01:48:29 -04:00
Roger Dingledine 0087a37bed tiny changes i found in my sandbox 2010-08-09 18:50:49 -04:00
Nick Mathewson f060b18e6c Fix a rare bug in rend_fn tests when the randomly generated port is 0
Since the rend code doesn't like the port to be 0, we shouldn't generate
the port by declaring crypto_rand_int(65536); instead we should
say crypto_rand_int(65535)+1.

Diagnosed by Matt Edman; fixes bug 1808.
2010-08-07 14:31:58 -04:00
Nick Mathewson 93edf0cb6c Merge commit 'karsten/stats_v4_rebased' 2010-08-06 10:46:59 -04:00
Karsten Loesing 83626ec91c Move exit-stats code to the end of rephist.c. 2010-08-05 13:05:33 +02:00
Sebastian Hahn d365bc965d Only delay counting bridge users if we were a relay before 2010-08-05 13:05:32 +02:00
Karsten Loesing 166c2f4d92 Allow enabling or disabling *Statistics while Tor is running.
With this patch we stop scheduling when we should write statistics using a
single timestamp in run_scheduled_events(). Instead, we remember when a
statistics interval starts separately for each statistic type in geoip.c
and rephist.c. Every time run_scheduled_events() tries to write stats to
disk, it learns when it should schedule the next such attempt.

This patch also enables all statistics to be stopped and restarted at a
later time.

This patch comes with a few refactorings, some of which were not easily
doable without the patch.
2010-08-05 13:05:25 +02:00
Nick Mathewson de7ed2fd7a Merge commit 'origin/maint-0.2.1'
Conflicts:
	debian/changelog
	debian/control
	debian/patches/03_tor_manpage_in_section_8.dpatch
	debian/patches/06_add_compile_time_defaults.dpatch
	debian/rules
2010-08-04 12:37:30 -04:00
Nick Mathewson e7d2a9b6c4 Remove the debian directory from the main git repository
Once upon a time it made sense to keep all the Debian files in the
main Tor distribution, since repeatedly merging them back in was hard.
Now that we're on git, that's no longer so.

Peter's debian repository at debian/tor.git on our git server has the
most recent version of the tor-on-debian packaging stuff, and the versions
in our own repository have gotten out of date.

Resolves bug #1735.
2010-08-04 12:21:48 -04:00
Nick Mathewson cafd868a78 Clarify that implementation is for discussion of implementation 2010-08-03 14:25:07 -04:00
Nick Mathewson d5abd0b43e Add proposal 174 from Ian Goldberg: Optimistic Data for Tor: Server Side 2010-08-03 14:23:51 -04:00
Nick Mathewson 9d317e9bb4 Bless two proposals from Damian Johnson as 172 and 173.
(Leaving a gap for the proposal Jake blessed as 171.)
2010-08-03 13:23:34 -04:00
Nick Mathewson 51377ae1bb Merge commit 'sebastian/mlockall' 2010-08-03 10:50:18 -04:00
Nick Mathewson 3556d27085 Merge commit 'erinn/rpm-devel' 2010-08-03 10:48:30 -04:00
Nick Mathewson b4e2d0607d Merge commit 'sebastian/distcheck' 2010-08-03 10:07:57 -04:00
Nick Mathewson 05fa0a3ef6 Merge commit 'sebastian/rend-spec' 2010-08-03 09:16:24 -04:00
Nick Mathewson ba24acbf1f Merge commit 'karsten/dir-spec-fix' 2010-08-03 09:14:38 -04:00
Nick Mathewson 6d8b932659 Merge commit 'origin/maint-0.2.1' 2010-08-03 09:13:17 -04:00
Sebastian Hahn 8557f64220 Clarify that rend cookies shouldn't be reused 2010-08-03 14:48:17 +02:00
Karsten Loesing b3b3c919c6 Fix copy-and-paste fail in dir-spec.txt. 2010-08-03 13:12:06 +02:00
Karsten Loesing f206209abf Update to the August 1 2010 Maxmind GeoLite Country database. 2010-08-03 13:04:09 +02: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
Nick Mathewson 9265190b16 Merge branch 'bug1384' 2010-08-02 12:53:52 -04:00
Sebastian Hahn a9d055c5c5 Fix a compile warning on OS X 10.6
Also update the changes file to contain a note on which bug was
fixed by this.
2010-08-02 18:45:17 +02:00
Chris Ball 73a4c0690e Bug #919: Don't rebind ports if we receive SIGHUP while hibernating. 2010-08-02 12:14:01 -04:00
Chris Ball 9ffa977981 Bug #928: Disallow BridgeRelay 1 and ORPort 0 configuration 2010-08-02 12:04:04 -04:00
Chris Ball 600ba86f4a Bug #1107: Complain if PublishServerDescriptor receives 0 or 1 in a list
0 or 1 should only be passed as the sole argument. Warn for now, reject
in 0.2.3.x.
2010-08-02 12:02:06 -04:00
Nick Mathewson fbfaa7bbc4 Merge commit 'sebastian/bug1776_v2' 2010-08-02 11:32:49 -04:00
Nick Mathewson 4504640b10 Merge branch 'bug1094_v2' 2010-08-02 11:11:02 -04:00
Chris Ball 1470eb2e91 Bug #1222: Clarify new circuit after sleep notice
("Application request when we're believed to be offline." ->
 "Application request when we haven't used client functionality lately.")
2010-07-31 16:58:49 -04:00
Nick Mathewson 49b0eb7a32 Fix up geoip unit tests to know about ?? 2010-07-31 15:21:08 -04:00
Nick Mathewson b175c584d5 Set up the geoip country table right even if not called normally 2010-07-31 15:21:08 -04:00
Nick Mathewson 4dd4d240b7 Move the "nowhereland" logic into geoip.c 2010-07-31 15:21:00 -04:00
Nick Mathewson 8fca6fb2aa Make "Nowhere" explicitly listable in torrc.
We already had the country code ?? indicating an unknown country, so all we
needed to do to make unknown countries excludable was to make the ?? code
discoverable.
2010-07-31 15:00:06 -04:00
Nick Mathewson 883af78a9d Clarify that cmd-line options override torrc options 2010-07-31 13:23:41 -04:00
Nick Mathewson 39378bf182 Warn when encounter the same (non-list) option twice in the same place
It's okay to get (say) a SocksPort line in the torrc, and then a
SocksPort on the command line to override it, and then a SocksPort via
a controller to override *that*.  But if there are two occurrences of
SocksPort in the torrc, or on the command line, or in a single SETCONF
command, then the user is likely confused.  Our old code would not
help unconfuse the user, but would instead silently ignore all but
the last occurrence.

This patch changes the behavior so that if the some option is passed
more than once to any torrc, command line, or SETCONF (each of which
coincidentally corresponds to a call to config_assign()), and the
option is not a type that allows multiple occurrences (LINELIST or
LINELIST_X), then we can warn the user.

This closes trac entry 1384.
2010-07-31 13:16:48 -04:00
Sebastian Hahn 9ca311f622 Allow using regular relays as bridges 2010-07-31 10:24:24 +02:00
Nick Mathewson 15424bf800 Document 20KB requirement in BandwidthRate documentation
This fixes the last suggestion of bug #1195.
2010-07-30 18:00:43 -04:00
Nick Mathewson 7409929917 Merge commit 'karsten/rendspec-master' 2010-07-30 11:45:22 -04:00
Nick Mathewson 86a3b650b8 Add a changes file for Linus's makefile-var-exp branch. 2010-07-30 11:37:42 -04: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
Karsten Loesing 1cf6da821c Add two authoritzation protocols to rend-spec.txt. 2010-07-30 10:33:28 +02:00