ebf6786ab3
Merge remote branch 'origin/maint-0.2.2'
...
Fixed conflict: router_get_my_routerinfo now returns const
Conflicts:
src/or/router.c
2011-03-14 17:22:38 -04:00
b97d9abd09
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
2011-03-14 17:04:53 -04:00
50c9d31029
finish a comment
2011-03-14 16:46:43 -04:00
e91a8c5589
Merge remote branch 'origin/maint-0.2.2'
...
Resolved nontrivial conflict around rewrite_x_address_for_bridge and
learned_bridge_descriptor. Now, since leanred_bridge_descriptor works
on nodes, we must make sure that rewrite_node_address_for_bridge also
works on nodes.
Conflicts:
src/or/circuitbuild.c
2011-03-14 16:34:33 -04:00
0588330c1d
Merge remote branch 'arma/bug2510' into maint-0.2.2
2011-03-14 16:14:54 -04:00
cb101c4815
Merge branch 'bug2511' into bug2510
2011-03-14 15:52:53 -04:00
f1c365b032
Merge remote branch 'origin/maint-0.2.2'
...
Fix trivial add/add conflict in main.c
Conflicts:
src/or/main.c
2011-03-14 15:31:24 -04:00
b639add1a0
Merge remote branch 'arma/bug2716' into maint-0.2.2
2011-03-14 15:29:02 -04:00
72b89c96bf
fix two issues pointed out by nickm
2011-03-13 16:56:41 -04:00
1a9d19e972
we're not reachable if we don't have a routerinfo yet
2011-03-13 15:47:59 -04:00
61f648ae37
fix one more typo
2011-03-13 15:22:45 -04:00
176fde505f
Tweak bug2716 patch a little
...
Name the magic value "10" rather than re-deriving it.
Comment more.
Use the pattern that works for periodic timers, not the pattern that
doesn't work. ;)
2011-03-12 00:19:52 -05:00
d52a99dc77
Merge remote branch 'origin/maint-0.2.2'
2011-03-11 23:34:46 -05:00
d34a5cdc59
Merge branch 'hsdir_assignment' into maint-0.2.2
2011-03-11 23:30:25 -05:00
3a0c602155
Clarify threat description and avoid negative uptimes.
2011-03-11 23:27:53 -05:00
977e396e86
improve accuracy for when a relay went unreachable
2011-03-11 22:12:15 -05:00
600ad7bf8d
Merge commit 'sebastian/bug2663' into maint-0.2.2
2011-03-11 20:37:21 -05:00
0b07b5dc98
Merge branch 'maint-0.2.2'
2011-03-11 17:40:16 -05:00
879f1718ad
Merge branch 'maint-0.2.1' into maint-0.2.2
2011-03-11 17:39:54 -05:00
151ab61442
put the 0.2.1.30 changes into releasenotes
2011-03-11 17:38:55 -05:00
f7a3cdc8f2
Use observed instead of declared uptime for HSDir
...
It is important to verify the uptime claim of a relay instead of just
trusting it, otherwise it becomes too easy to blackhole a specific
hidden service. rephist already has data available that we can use here.
Bugfix on 0.2.0.10-alpha.
2011-03-11 18:44:35 +01:00
4740311d18
Merge remote branch 'origin/maint-0.2.2'
2011-03-10 16:11:39 -05:00
48c4d53281
Add a step to the release process: tell trac about the version.
2011-03-10 16:10:53 -05:00
92e607d951
Merge remote branch 'origin/maint-0.2.2'
2011-03-09 16:22:50 -05:00
78d5955e5b
oops. I got the bug number wrong.
2011-03-09 16:22:18 -05:00
dc0bb6b709
oops. I got the bug number wrong.
2011-03-09 16:21:34 -05:00
19baca4837
Merge remote branch 'origin/maint-0.2.2'
2011-03-09 16:20:14 -05:00
f31ba6a356
openSUSE initscript create /var/run/tor fixes Ticket #2573
...
(changes file added by nickm)
2011-03-09 16:18:44 -05:00
b5f2b449ee
forward-port the 0.2.2.23-alpha changelog
2011-03-08 18:59:48 -05:00
e569e6b201
Merge branch 'maint-0.2.2'
2011-03-08 18:16:27 -05:00
6426cd14f3
Merge branch 'maint-0.2.1' into maint-0.2.2
2011-03-08 18:16:06 -05:00
d080fe8db1
move to march 2011 geoip file
2011-03-08 18:15:17 -05:00
63651b9191
Merge remote branch 'origin/maint-0.2.2'
...
Trivial conflicts fixed in or.h
Conflicts:
src/or/or.h
2011-03-08 16:20:53 -05:00
cb3c3c63cb
Merge branch 'maint-0.2.2'
2011-03-08 16:14:53 -05:00
00446973f2
Merge remote branch 'sebastian/bug2250' into maint-0.2.2
2011-03-08 16:13:28 -05:00
f9bb3ced51
Merge remote branch 'origin/maint-0.2.2'
...
Resolved trivial one-line conflicts.
Conflicts:
src/or/dirserv.c
src/or/rephist.c
2011-03-08 16:10:40 -05:00
dbd4a01756
steps roger takes when making a new release
2011-03-08 16:06:32 -05:00
0d78a16c36
Merge remote branch 'sebastian/bug1035' into maint-0.2.2
2011-03-08 15:52:43 -05:00
9c72324ae8
update spec locations
2011-03-08 15:31:04 -05:00
d5907e7d9d
Merge remote branch 'origin/maint-0.2.2'
2011-03-08 15:23:30 -05:00
9ad083d573
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
2011-03-08 15:20:48 -05:00
9a6df21539
Avoid crash in any_pending_bridge_descriptor_fetches
...
This is based on shitlei's fix for bug2629, with extra parens removed.
Fixes bug 2629, bugfix on 0.2.1.2-alpha.
2011-03-08 15:17:41 -05:00
95edd51116
make nickm's proposed convention from 2003 be gospel
2011-03-08 14:59:30 -05:00
26009a3ed0
Merge remote branch 'origin/maint-0.2.2'
2011-03-07 17:12:08 -05:00
3bd83b8fb6
Merge remote branch 'sebastian/bug2660' into maint-0.2.2
2011-03-07 17:09:23 -05:00
2f8e96b553
Fix log message when we have too few dirauths
...
The calculation of when to send the logmessage was correct, but we
didn't give the correct number of relays required: We want more than
half of all authorities we know about. Fixes bug 2663.
2011-03-07 00:06:36 +01:00
176e8a0a2a
Merge remote branch 'origin/maint-0.2.2'
...
Conflicts:
src/or/routerparse.c
2011-03-06 13:46:11 -05:00
35fcec3880
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
2011-03-06 13:42:28 -05:00
4fa70e11ed
Merge branch 'real_ipv6_fix' into maint-0.2.1
2011-03-06 13:42:05 -05:00
2ce132e335
Oops, here's the *REAL* fix for the ipv6 issue
...
We need to _REJECT_ descriptors with accept6/reject6 lines. If we
let them onto the network , other un-upgraded tors will crash.
2011-03-06 13:41:55 -05:00
Nick Mathewson
Roger Dingledine
Sebastian Hahn
Andreas Stieger