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
fac99f01da
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-05-03 21:54:18 -04:00
Nick Mathewson
4126de6888
Fix circuit_list_path_impl(): internal circuits do not have an "exit". Trivial fix for 3079.
2011-05-03 21:53:59 -04:00
Nick Mathewson
5ee5103f63
Initial draft changelog for 0.2.3.1-alpha
2011-05-03 21:33:10 -04:00
Nick Mathewson
993536e78e
Remove changes files already merged into release-0.2.2
2011-05-03 20:54:37 -04:00
Nick Mathewson
599d1b62b4
Merge remote-tracking branch 'origin/maint-0.2.2'
...
Conflicts:
src/or/main.c
src/or/microdesc.c
2011-05-03 17:30:58 -04:00
Nick Mathewson
68ae5afa5a
Change who calls microdesc_cache_rebuild().
...
Previously we ensured that it would get called periodically by doing
it from inside the code that added microdescriptors. That won't work
though: it would interfere with our code that tried to read microdescs
from disk initially. Instead, we should consider rebuilding the cache
periodically, and on startup.
2011-05-03 17:28:28 -04:00
Nick Mathewson
865d53be54
Merge remote-tracking branch 'origin/maint-0.2.2'
...
Conflicts:
src/or/microdesc.c
2011-05-03 17:19:35 -04:00
Nick Mathewson
cb6c909664
Rebuild the microdesc cache when a sufficient number of bytes are dropped
...
Previously on 0.2.2, we'd never clean the cache. Now that we can
clean it, we want to add a condition to rebuild it: that should happen
whenever we have dropped enough microdescriptors that we could save a
lot of space.
No changes file, since 0.2.3 doesn't need one and 0.2.2 already has some
changes files for the backport of the microdesc_clean_cahce() function.
2011-05-03 17:03:49 -04:00
Nick Mathewson
97a55b8089
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-05-03 16:46:28 -04:00
Nick Mathewson
56fbd728c2
Backport microdesc_cache_clean to 0.2.2
...
Otherwise we have no way to keep authorities' microdesc caches in 0.2.2
from growing without bound.
2011-05-03 16:45:15 -04:00
Nick Mathewson
1f97e8322f
Merge remote-tracking branch 'origin/maint-0.2.2'
...
Conflicts:
src/or/microdesc.c
2011-05-03 16:33:41 -04:00
Nick Mathewson
970715dd8f
Fix a check for when to rebuild the microdesc cache. (Backport from 0.2.3.
2011-05-03 16:29:39 -04:00
Nick Mathewson
698fa0fc67
Add missing code to set cache->journal_len when reading microdesc journal
...
This could be one reason that authorities' journals would grow without
bound; related to bug 2230. Bugfix on 0.2.2.6-alpha. Fix by
"cypherpunks".
2011-05-03 16:22:31 -04:00
Nick Mathewson
5b96773a40
Merge remote-tracking branch 'sebastian/bug3047'
2011-05-02 20:21:08 -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
Sebastian Hahn
47a2e5a9ce
Don't choose exit nodes without desc available
...
n_supported[i] has a random value prior to initialization, so a node
that doesn't have routerinfo available can have a random priority.
Patch contributed by wanoskarnet from #tor. Thanks!
2011-04-30 22:03:51 +02:00
Nick Mathewson
751e408055
Make findMergedChanges.pl print a usage msg when started with no args
...
Otherwise I need to figure out what it does and how to make it do it
every time I want to use it. It did that unixy thing where running
it with no arguments printed nothing and returned.
2011-04-29 15:27:44 -04:00
Nick Mathewson
a23ec308e4
Remove changes files that were merged to changelogs of 0.2.2.25-alpha or earlier
2011-04-29 15:25:33 -04:00
Nick Mathewson
c48d6da24c
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-04-29 11:15:11 -04:00
Nick Mathewson
dbd73b9689
Clean up a warning a bit
2011-04-29 11:14:53 -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
daede6f97b
Add 0.2.2.25-alpha changelog on master
2011-04-28 23:31:42 -04:00
Nick Mathewson
20d6ac3530
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-04-28 21:17:51 -04:00
Nick Mathewson
f0d9e2d650
Merge remote-tracking branch 'arma/bug3012' into maint-0.2.2
2011-04-28 21:15:14 -04:00
Roger Dingledine
66de6f7eb8
relays checkpoint their state file twice a day
2011-04-28 21:06:25 -04:00
Nick Mathewson
b0a7e0d6ca
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-04-28 20:55:03 -04:00
Nick Mathewson
4010427b51
Merge remote-tracking branch 'arma/bug3039' into maint-0.2.2
2011-04-28 20:53:44 -04:00
Roger Dingledine
df3cf881d1
stop putting wacky values into state->lastwritten
2011-04-28 20:40:15 -04:00
Nick Mathewson
9d67d16c6a
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-04-28 20:38:50 -04:00
Nick Mathewson
5693fedb60
Clarify comment to say which version fixed 2722
2011-04-28 20:38:15 -04:00
Nick Mathewson
6b9aadd557
Merge remote-tracking branches 'rransom/bug2722' and 'rransom/bug2722b' into maint-0.2.2
2011-04-28 20:36:38 -04:00
Nick Mathewson
bb8689b864
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-04-28 20:05:48 -04:00
Nick Mathewson
c122897925
Merge remote-tracking branch 'sebastian/bug3020' into maint-0.2.2
2011-04-28 20:03:57 -04:00
Roger Dingledine
710227a77f
fix a function comment
2011-04-28 19:19:04 -04:00
Sebastian Hahn
525d2700dd
Correctly check elapsed time in last hibernation period
...
Fix bug 3020.
2011-04-29 01:18:32 +02:00
Nick Mathewson
f38ecd5ac0
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-04-28 18:14:50 -04:00
Nick Mathewson
30003e4318
Merge branch 'bug3000-022-part2-squashed' into maint-0.2.2
2011-04-28 18:13:17 -04:00
Nick Mathewson
6dfc0d5301
Avoid false positives from proxy_mode()
...
Previously it would erroneously return true if ListenAddr was set for
a client port, even if that port itself was 0. This would give false
positives, which were not previously harmful... but which were about
to become.
2011-04-28 18:11:58 -04:00
Robert Ransom
b8708b5bd3
Fix bug 1930
2011-04-28 18:11:58 -04:00
Robert Ransom
ddd1b7be2d
Ignore SIGNAL NEWNYM on relay-only Tor instances
2011-04-28 18:10:17 -04:00
Robert Ransom
df5c7fedbd
Don't allow v0 HS auths to act as clients
...
A v0 HS authority stores v0 HS descriptors in the same descriptor
cache that its HS client functionality uses. Thus, if the HS
authority operator clears its client HS descriptor cache, ALL v0
HS descriptors will be lost. That would be bad.
2011-04-28 18:10:16 -04:00
Nick Mathewson
8b33928676
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-04-28 17:15:31 -04:00
John Brooks
2dc9546eef
Correct the logic from f14754fbd for tor_gmtime_r
2011-04-28 17:13:45 -04:00
