Nick Mathewson
4dde69a6d0
Merge remote branch 'origin/maint-0.2.2'
2011-03-15 15:19:38 -04:00
Nick Mathewson
ab418447eb
Merge branch 'bug2757' into maint-0.2.2
2011-03-15 15:18:15 -04:00
Nick Mathewson
c42bd529de
Merge remote branch 'origin/maint-0.2.2'
2011-03-15 15:14:28 -04:00
Nick Mathewson
5938804d17
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
2011-03-15 15:14:12 -04:00
Sebastian Hahn
30b3f0cdb1
Fix a compile warning when using clang
...
Issue noticed by Steven Murdoch; fixes bug 2689. The cast didn't do
anything, and we don't need to look at the return value of the function
here.
2011-03-15 15:13:35 -04:00
Nick Mathewson
84f27eb051
Merge remote branch 'origin/maint-0.2.2'
2011-03-15 14:50:42 -04:00
Robert Ransom
98abe1420d
Fix a log message typo
2011-03-15 09:48:26 -07:00
Robert Ransom
3af59dcaee
Log the source of a rejected POSTed v3 vote
...
Related to ticket 2683.
2011-03-15 09:16:58 -07:00
Nick Mathewson
06f026de66
Check newconn, not conn, before marking newconn for close
...
This fixes bug 2757. It's a bugfix on 85da676108
2011-03-14 18:52:15 -04:00
Nick Mathewson
f038b45b09
clarify log messages based on suggestion from arma
2011-03-14 17:23:28 -04:00
Nick Mathewson
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
Nick Mathewson
b97d9abd09
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
2011-03-14 17:04:53 -04:00
Nick Mathewson
50c9d31029
finish a comment
2011-03-14 16:46:43 -04:00
Nick Mathewson
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
Nick Mathewson
0588330c1d
Merge remote branch 'arma/bug2510' into maint-0.2.2
2011-03-14 16:14:54 -04:00
Roger Dingledine
cb101c4815
Merge branch 'bug2511' into bug2510
2011-03-14 15:52:53 -04:00
Nick Mathewson
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
Nick Mathewson
b639add1a0
Merge remote branch 'arma/bug2716' into maint-0.2.2
2011-03-14 15:29:02 -04:00
Roger Dingledine
72b89c96bf
fix two issues pointed out by nickm
2011-03-13 16:56:41 -04:00
Roger Dingledine
1a9d19e972
we're not reachable if we don't have a routerinfo yet
2011-03-13 15:47:59 -04:00
Roger Dingledine
61f648ae37
fix one more typo
2011-03-13 15:22:45 -04:00
Nick Mathewson
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
Nick Mathewson
d52a99dc77
Merge remote branch 'origin/maint-0.2.2'
2011-03-11 23:34:46 -05:00
Nick Mathewson
d34a5cdc59
Merge branch 'hsdir_assignment' into maint-0.2.2
2011-03-11 23:30:25 -05:00
Nick Mathewson
3a0c602155
Clarify threat description and avoid negative uptimes.
2011-03-11 23:27:53 -05:00
Roger Dingledine
977e396e86
improve accuracy for when a relay went unreachable
2011-03-11 22:12:15 -05:00
Roger Dingledine
600ad7bf8d
Merge commit 'sebastian/bug2663' into maint-0.2.2
2011-03-11 20:37:21 -05:00
Roger Dingledine
0b07b5dc98
Merge branch 'maint-0.2.2'
2011-03-11 17:40:16 -05:00
Roger Dingledine
879f1718ad
Merge branch 'maint-0.2.1' into maint-0.2.2
2011-03-11 17:39:54 -05:00
Roger Dingledine
151ab61442
put the 0.2.1.30 changes into releasenotes
2011-03-11 17:38:55 -05:00
Sebastian Hahn
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
Nick Mathewson
4740311d18
Merge remote branch 'origin/maint-0.2.2'
2011-03-10 16:11:39 -05:00
Nick Mathewson
48c4d53281
Add a step to the release process: tell trac about the version.
2011-03-10 16:10:53 -05:00
Nick Mathewson
92e607d951
Merge remote branch 'origin/maint-0.2.2'
2011-03-09 16:22:50 -05:00
Nick Mathewson
78d5955e5b
oops. I got the bug number wrong.
2011-03-09 16:22:18 -05:00
Nick Mathewson
dc0bb6b709
oops. I got the bug number wrong.
2011-03-09 16:21:34 -05:00
Nick Mathewson
19baca4837
Merge remote branch 'origin/maint-0.2.2'
2011-03-09 16:20:14 -05:00
Andreas Stieger
f31ba6a356
openSUSE initscript create /var/run/tor fixes Ticket #2573
...
(changes file added by nickm)
2011-03-09 16:18:44 -05:00
Roger Dingledine
b5f2b449ee
forward-port the 0.2.2.23-alpha changelog
2011-03-08 18:59:48 -05:00
Roger Dingledine
e569e6b201
Merge branch 'maint-0.2.2'
2011-03-08 18:16:27 -05:00
Roger Dingledine
6426cd14f3
Merge branch 'maint-0.2.1' into maint-0.2.2
2011-03-08 18:16:06 -05:00
Roger Dingledine
d080fe8db1
move to march 2011 geoip file
2011-03-08 18:15:17 -05:00
Nick Mathewson
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
Roger Dingledine
cb3c3c63cb
Merge branch 'maint-0.2.2'
2011-03-08 16:14:53 -05:00
Nick Mathewson
00446973f2
Merge remote branch 'sebastian/bug2250' into maint-0.2.2
2011-03-08 16:13:28 -05:00
Nick Mathewson
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
Roger Dingledine
dbd4a01756
steps roger takes when making a new release
2011-03-08 16:06:32 -05:00
Nick Mathewson
0d78a16c36
Merge remote branch 'sebastian/bug1035' into maint-0.2.2
2011-03-08 15:52:43 -05:00
Roger Dingledine
9c72324ae8
update spec locations
2011-03-08 15:31:04 -05:00
Nick Mathewson
d5907e7d9d
Merge remote branch 'origin/maint-0.2.2'
2011-03-08 15:23:30 -05:00
