Nick Mathewson
1a49fdecf8
Tweaks to Cagara's CountPrivateBandwidth patch:
...
- Document it in the manpage
- Add a changes entry
- No need to log when it is set: we don't log for other options.
- Use doxygen to document the new flag.
- Test truth of C variables with "if (x)", not "if (x == 1)".
- Simplify a complex boolean expression by breaking it up.
2011-04-05 16:24:42 -04:00
Nick Mathewson
3a9d0b4b9c
remove duplicate changes file for 2702
2011-04-04 16:09:44 -04:00
Nick Mathewson
3cf23be712
Merge branch 'static-work'
2011-04-04 15:35:23 -04:00
Nick Mathewson
ad1ae44154
Changes file for static-work branch
2011-04-04 15:35:16 -04:00
Roger Dingledine
1587e0d470
Merge branch 'maint-0.2.2'
2011-04-04 03:54:03 -04:00
Roger Dingledine
9d2b3849b2
Merge branch 'maint-0.2.1' into maint-0.2.2
2011-04-04 03:53:38 -04:00
Roger Dingledine
0cdd262941
switch to the apr 2011 geoip db
2011-04-04 03:52:58 -04:00
Sebastian Hahn
e97f78d789
Small fixes for the 2702 implementation
...
Improve the INSTALL documentation for static builds, remove a few
unnecessary lines from configure.in and tweak the changelog message
slightly.
2011-04-02 12:15:08 +02:00
Jacob Appelbaum
fe051a43c1
add --enable-static-tor to our configure script
...
This implements the feature request in bug #2702
2011-04-02 11:09:38 +02:00
Nick Mathewson
ee871e7a0e
Merge remote-tracking branch 'origin/maint-0.2.2'
...
Conflicts:
src/common/compat.h
src/or/circuitlist.c
src/or/circuituse.c
src/or/or.h
src/or/rephist.c
2011-03-30 14:55:50 -04:00
Nick Mathewson
65eb0e41ac
Use cbt to tell when to launch parallel intro circuit
...
Implement feature from trac #2799
2011-03-30 14:41:53 -04:00
Nick Mathewson
aa950e6c48
Use timevals, not time_t, when expiring circuits.
...
We've got millisecond timers now, we might as well use them.
This change won't actually make circuits get expiered with microsecond
precision, since we only call the expiry functions once per second.
Still, it should avoid the situation where we have a circuit get
expired too early because of rounding.
A couple of the expiry functions now call tor_gettimeofday: this
should be cheap since we're only doing it once per second. If it gets
to be called more often, though, we should onsider having the current
time be an argument again.
2011-03-30 14:41:41 -04:00
Nick Mathewson
22f7042b91
Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2
2011-03-28 17:49:34 -04:00
Erinn Clark
3a7cee9d29
Fix configure.in zlib package names.
2011-03-28 17:48:22 -04:00
Nick Mathewson
18126f92a7
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-03-28 12:17:35 -04:00
Sebastian Hahn
4762118832
Small tweaks for bug2698 bugfix
2011-03-27 05:38:53 +02:00
Jacob Appelbaum
b62abf9f21
Fix libevent autoconf bug #2698
2011-03-27 05:38:51 +02:00
Nick Mathewson
8b393afa94
Merge remote branch 'origin/maint-0.2.2'
...
Trivial Conflicts:
configure.in
2011-03-18 12:44:37 -04:00
Nick Mathewson
f3d6663665
Merge remote branch 'sebastian/bug2696' into maint-0.2.2
2011-03-18 12:39:40 -04:00
Sebastian Hahn
4aac35cafa
Add 2696 changes file
2011-03-18 17:13:43 +01:00
Nick Mathewson
b1b6552251
Merge remote-tracking branch 'origin/maint-0.2.2'
...
Conflicts:
src/common/crypto.c
2011-03-16 17:16:54 -04:00
Nick Mathewson
cf399f1034
add changes file for the doxygen issues
2011-03-16 17:13:27 -04:00
Nick Mathewson
415caba967
Merge remote branch 'arma/optimistic_server'
2011-03-15 17:20:41 -04:00
Nick Mathewson
737228ed8e
Merge remote branch 'origin/maint-0.2.2'
2011-03-15 17:18:29 -04:00
Nick Mathewson
c5ffd44ccd
Merge branch 'bug2756_relay' into maint-0.2.2
2011-03-15 17:13:07 -04:00
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
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
6a97450cbd
Add changes file for server-side optimistic data patch
2011-03-14 18:25:20 -04:00
Nick Mathewson
1d36a8e9ae
Consider sending stream-level SENDME cells on partial flushes.
...
Right now, we only consider sending stream-level SENDME cells when we
have completely flushed a connection_edge's outbuf, or when it sends
us a DATA cell. Neither of these is ideal for throughput.
This patch changes the behavior so we now call
connection_edge_consider_sending_sendme when we flush _some_ data from
an edge outbuf.
Fix for bug 2756; bugfix on svn r152.
2011-03-14 17:48:45 -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
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
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
1a9d19e972
we're not reachable if we don't have a routerinfo yet
2011-03-13 15:47:59 -04:00
Nick Mathewson
d52a99dc77
Merge remote branch 'origin/maint-0.2.2'
2011-03-11 23:34:46 -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
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
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
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
