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
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
fe86be61b6
Fix signed/unsigned compare warning
2011-03-18 12:42:00 -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
Sebastian Hahn
3f94c4a1cb
Remove superfluous -g -O2 compiler argument
...
Autoconf adds -g -O2 by default, so adding it ourselves is not required.
It also caused a warning with clang for every source file, so remove it
here. Fixes last issue of ticket 2696.
2011-03-18 17:04:01 +01:00
Nick Mathewson
547635c004
Futz with the clang patch a bit and tidy some geoip.c stuff
2011-03-17 14:06:04 -04:00
Nick Mathewson
1db6eb6cb7
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-03-16 18:10:24 -04:00
Nick Mathewson
9dfa244484
Document a few more members.
2011-03-16 18:10:15 -04:00
Nick Mathewson
721954b3a2
Resolve the one DOCDOC in the 0.2.2 code atm
2011-03-16 18:07:55 -04:00
Nick Mathewson
8f9cfa0abe
Remove a useless doxygen comment
2011-03-16 18:07:42 -04:00
Nick Mathewson
27d1675d93
Move the decl for tor_gettimofday_cache_clear to the right header
2011-03-16 17:54:48 -04: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
3310dd2358
Clean up whitespace
2011-03-16 17:11:30 -04:00
Nick Mathewson
57b954293e
Merge remote-tracking branch 'origin/maint-0.2.2'
...
Trivial Conflicts in
src/common/crypto.c
src/or/main.h
src/or/or.h
2011-03-16 17:09:32 -04:00
Nick Mathewson
6617822b84
Doxygen documentation for about 100 things that didn't have any
...
About 860 doxygen-less things remain in 0.2.2
2011-03-16 17:05:37 -04:00
Nick Mathewson
7f6af7a602
Fix up all doxygen warnings other than "foo is not documented"
2011-03-16 14:47:27 -04:00
Nick Mathewson
2def9e0a6e
Turn on the "source browser" feature for our generated HTML.
2011-03-16 14:36:42 -04:00
Nick Mathewson
57e23fc9a5
Run "doxygen -u" to update doxygen config file.
2011-03-16 14:34:59 -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
Roger Dingledine
c2775196f7
whitespace fixes to pass 'make check-spaces'
2011-03-15 16:59:58 -04:00
Nick Mathewson
a86e27cf00
Fix comment for connection_edge_consider_sending_sendme
2011-03-15 15:35:11 -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
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
