summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-03-20Let testing networks override ABSOLUTE_MIN_VALUE_FOR_FAST_FLAGNick Mathewson
This adds a new option to fix bug 8508 which broke chutney networks. The bug was introduced by 317d16de.
2013-03-20Merge commit '2f98bf5c9fac4dfd1bb07564ce08b13d1e330252' into maint-0.2.4Nick Mathewson
(This is the part of the Bug 8042 patch that warns about unsigned time_t)
2013-03-20Merge remote-tracking branch 'public/bug6304_v3' into maint-0.2.4Nick Mathewson
Conflicts: src/or/circuitbuild.c src/or/config.c
2013-03-19Merge branch 'bug7350_redux' into maint-0.2.4Nick Mathewson
2013-03-19Don't assert when writing a cell to a CLOSING connection.Nick Mathewson
Instead, drop the cell. Fixes another case of bug 7350; bugfix on 0.2.4.4-alpha
2013-03-19Merge remote-tracking branch 'public/bug7164_diagnostic' into maint-0.2.4Nick Mathewson
2013-03-19Merge branch 'bug8240_v2_squashed' into maint-0.2.4Nick Mathewson
Conflicts: doc/tor.1.txt src/or/circuitbuild.c src/or/config.c src/or/or.h
2013-03-19Drop the minimum guard lifetime back down to one monthNick Mathewson
Mike believes that raising the default to 2 months with no way to lower it may create horrible load-balancing issues.
2013-03-19Add support for days of the week to intervalsNick Mathewson
2013-03-19Document the GuardLifetime optionNick Mathewson
2013-03-19Make the guard lifetime configurable and adjustable via the consensusNick Mathewson
Fixes 8240. (Don't actually increase the default guard lifetime. It seems likely to break too many things if done precipitiously.)
2013-03-19Merge remote-tracking branch 'public/bug7950' into maint-0.2.4Nick Mathewson
2013-03-19Merge remote-tracking branch 'public/bug7768' into maint-0.2.4Nick Mathewson
2013-03-19Use --test-commandline name in tor-fw-helper manpageNick Mathewson
2013-03-19Use option name --test-commandline in tor-fw-helper.David Fifield
It was previously --Test in the help output and --test-commandline in the getopt call. The man page already had --test. (Originally by David, who resolved the tie in favor of "--test"; I chose --test-commandline" instead so that nothing that depended on it could break. -Nick)
2013-03-19Merge remote-tracking branch 'public/bug8002' into maint-0.2.4Nick Mathewson
2013-03-19Merge remote-tracking branch 'public/bug8031' into maint-0.2.4Nick Mathewson
2013-03-19Merge branch 'bug7582_v2' into maint-0.2.4Nick Mathewson
2013-03-19Free prepend_policy values in origin circuitsNick Mathewson
2013-03-18Merge remote-tracking branch 'public/bug6174' into maint-0.2.4Nick Mathewson
2013-03-18Merge remote-tracking branch 'public/bug8062' into maint-0.2.4Nick Mathewson
2013-03-18Merge branch 'bug7947' into maint-0.2.4Nick Mathewson
2013-03-18Handle TRUNCATE correctly if our next channel isn't done yet.Nick Mathewson
Patch from 'cypherpunks'. Fixes bug #7947. Bugfix on 0.0.7.1.
2013-03-18Merge remote-tracking branch 'public/bug6164' into maint-0.2.4Nick Mathewson
2013-03-18Fix another case of bug 8206; patch from flupzorNick Mathewson
2013-03-18Merge remote-tracking branch 'public/bug6673' into maint-0.2.4Nick Mathewson
2013-03-18Fix some wide linesNick Mathewson
2013-03-18Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4Nick Mathewson
Conflicts: src/test/test_addr.c
2013-03-18Merge remote-tracking branch 'public/bug8377' into maint-0.2.3Nick Mathewson
2013-03-18Merge remote-tracking branch 'andrea/bug8435' into maint-0.2.4Nick Mathewson
2013-03-18Make stream events for RESOLVE lookups more consistentNick Mathewson
Fixes 8203; patch by Desoxy
2013-03-18Merge remote-tracking branch 'public/bug8290' into maint-0.2.4Nick Mathewson
2013-03-18Improve comment for routers_with_measured_bw static var in dirserv.cAndrea Shepard
2013-03-18Improve comment on router_counts_toward_thresholds()Andrea Shepard
2013-03-18Add dirserv_has_measured_bw() predicate wrapper for ↵Andrea Shepard
dirserv_query_measured_bw_cache()
2013-03-18Merge remote-tracking branch 'public/no_dup_guards' into maint-0.2.4Nick Mathewson
2013-03-18Merge remote-tracking branch 'public/bug8059' into maint-0.2.4Nick Mathewson
2013-03-18Remove an unused local variable.Nick Mathewson
2013-03-18Merge branch 'bug8206_squashed' into maint-0.2.4Nick Mathewson
2013-03-18Check return values from fcntl and setsockoptNick Mathewson
(Based on a patch from flupzor; bug #8206)
2013-03-18Check for 0.2.4.8, not 0.2.4.7, to determine EXTEND2 supportNick Mathewson
Fixes bug 8464; bugfix on b2863739 in 0.2.4.8-alpha
2013-03-18Ignore advertised bandwidths if we have enough measured bandwidths availableAndrea Shepard
2013-03-15Merge remote-tracking branch 'public/bug8180_023_v2' into maint-0.2.4Nick Mathewson
2013-03-15Upgrade the warn for EntryNodes without UseEntryGuards to an errorNick Mathewson
fixes bug 8180
2013-03-15Merge remote-tracking branch 'public/unused_stuff' into maint-0.2.4Nick Mathewson
2013-03-15Fix some basic socket issues with tor-fw-helper-natpmp on windowsNick Mathewson
This isn't going to be the last of these issues, but we might as well take the fixes as we find them. Patch from Gisle Vanem, fixes bug 7280.
2013-03-15Remove incentives.txt from tor git; putting it into torspec.Nick Mathewson
2013-03-15Fix brackets in tor-fw-helper help output.David Fifield
Change nesting from [(]) to [()]. Formerly it made it look to me at first glance that "internal port" was optional. [Trivial change; fixes #7767 --nickm]
2013-03-15Improve asciidoc-helper's suggestion of what to installNick Mathewson
Fixes bug #7766. Patch by David Fifield, revised by Peter Palfrader.
2013-03-15Be explicit that we want not only nacl but nacl-with-a-fast-curve25519Nick Mathewson
Resolves the user experience part of #8014.