Nick Mathewson
9eeb902d12
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-04-19 12:37:18 -04:00
Nick Mathewson
177cadff8d
Merge remote-tracking branch 'rransom/bug2948' into maint-0.2.2
2011-04-19 12:36:49 -04:00
Nick Mathewson
f52cfbfc00
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-04-19 12:31:55 -04:00
Nick Mathewson
0e554f93d6
Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2
2011-04-19 12:31:42 -04:00
Nick Mathewson
dfc9c6a0f9
Merge remote-tracking branch 'rransom/bug2750-v3' into maint-0.2.1
2011-04-19 12:30:50 -04:00
Nick Mathewson
bba47a836c
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-04-19 12:30:36 -04:00
Nick Mathewson
bc532bb13f
Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2
2011-04-19 12:30:11 -04:00
Nick Mathewson
cfd7b118a7
Ouch: correctly tabify the micro-revision.i target in Makefile.am (0.2.1 only)
2011-04-19 12:29:20 -04:00
Nick Mathewson
750b5119c0
Merge remote-tracking branch 'asn/heartbeat'
2011-04-19 12:08:28 -04:00
Nick Mathewson
48bdc2f729
Correct HS descriptor length check
...
Fixes bug 2948.
2011-04-18 13:53:13 -07:00
Robert Ransom
130db1bdeb
Merge branch 'bug2750-v3' into bug2948
2011-04-18 13:36:19 -07:00
Robert Ransom
adc31001c2
Add an XXX
2011-04-18 13:25:48 -07:00
Robert Ransom
bfebc942ea
Correct the warning emitted when rejecting an oversized HS desc
2011-04-18 13:17:40 -07:00
George Kadianakis
c2d9d80a07
Reuse get_bytes_{read,written}() in status.c
2011-04-16 14:48:46 +02:00
Roger Dingledine
c4bf7f59d8
forward-port the 0.2.2.24-alpha changelog
2011-04-11 23:26:27 -04:00
Sebastian Hahn
4cbbb92e7f
Add a changes file for the osx 10.6 compile fix
...
We forgot to put it into 0.2.2.24-alpha.
2011-04-08 22:56:28 +02:00
Nick Mathewson
99c2bfe76b
Merge remote-tracking branch 'origin/maint-0.2.2'
...
Conflicts:
src/or/rephist.c
2011-04-08 13:37:57 -04:00
Nick Mathewson
e247705afe
Merge branch 'bug2373' into maint-0.2.2
2011-04-08 13:35:26 -04:00
Nick Mathewson
85ac832a14
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-04-07 20:27:39 -04:00
Gisle Vanem
70e0291468
Use GetTempDir instead of hardcoded path to c:\windows\tmp for unittests
2011-04-07 18:34:11 -04:00
Nick Mathewson
1be1221385
Free pending_cb_messages on exit
2011-04-07 15:25:33 -04:00
Nick Mathewson
403b6cfded
Free circuits_for_buffer_stats on shutdown
2011-04-07 14:59:28 -04:00
Nick Mathewson
71fb2af62c
Fix up some cell-queue stats issues in rephist.c
...
- Document the structure and variables.
- Make circuits_for_buffer_stats into a static variable.
- Don't die horribly if interval_length is 0.
- Remove the unused local_circ_id field.
- Reorder the fields of circ_buffer_stats_t for cleaner alignment layout.
2011-04-07 14:56:50 -04:00
Nick Mathewson
67d88a7d60
Merge remote-tracking branch 'origin/maint-0.2.2'
...
Conflicts:
src/common/address.c
src/common/compat_libevent.c
src/common/memarea.c
src/common/util.h
src/or/buffers.c
src/or/circuitbuild.c
src/or/circuituse.c
src/or/connection.c
src/or/directory.c
src/or/networkstatus.c
src/or/or.h
src/or/routerlist.c
2011-04-07 12:17:20 -04:00
Nick Mathewson
ba0cd8094f
Merge remote-tracking branch 'public/xxx_fixups' into maint-0.2.2
...
Conflicts:
src/or/or.h
2011-04-07 12:03:04 -04:00
Nick Mathewson
07ab483e62
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-04-07 11:55:17 -04:00
Nick Mathewson
118d8ffdcb
Allow controllers a more up-to-date view of bridge usage.
...
Instead of answering GETINFO requests about our geoip usage only after
running for 24 hours, this patch makes us answer GETINFO requests
immediately. We still round and quantize as before.
Implements bug2711.
Also, refactor the heck out of the bridge usage formatting code. No
longer should we need to do a generate-parse-and-regenerate cycle to
get the controller string, and that lets us simplify the code a lot.
2011-04-07 11:53:37 -04:00
Nick Mathewson
09759a66ea
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-04-07 11:43:36 -04:00
Sebastian Hahn
286d44402e
Fix a compile warning on OS X 10.6
2011-04-07 05:47:55 +02:00
Nick Mathewson
53d02a63df
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-04-06 16:20:32 -04:00
Nick Mathewson
13f60e16eb
Merge remote-tracking branch 'public/bug2381'
2011-04-06 16:19:41 -04:00
Nick Mathewson
de1c36ff60
Merge maint-0.2.1 for bug2402_again fixes . Use "-s ours" so we don't actually take the patch.
2011-04-06 16:15:48 -04:00
Nick Mathewson
32341ac467
Merge remote-tracking branch 'public/bug2402_again' into maint-0.2.1
2011-04-06 16:13:22 -04:00
Nick Mathewson
f6cc8f0ee3
Add a missing ! to the check for CountPrivatebandwidth.
2011-04-06 15:24:44 -04:00
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
Daniel Cagara
e61f3293e4
Patch from cagara: Add a CountPrivateBandwidth flag
2011-04-05 16:24:01 -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
5eaba5ac21
Implement replacements for timer(add,cmp,sub) on platforms lacking them.
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
