summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2011-04-07Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson
2011-04-07Allow controllers a more up-to-date view of bridge usage.Nick Mathewson
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-07Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson
2011-04-07Fix a compile warning on OS X 10.6Sebastian Hahn
2011-04-06Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson
2011-04-06Merge remote-tracking branch 'public/bug2381'Nick Mathewson
2011-04-06Merge maint-0.2.1 for bug2402_again fixes . Use "-s ours" so we don't ↵Nick Mathewson
actually take the patch.
2011-04-06Merge remote-tracking branch 'public/bug2402_again' into maint-0.2.1Nick Mathewson
2011-04-06Add a missing ! to the check for CountPrivatebandwidth.Nick Mathewson
2011-04-05Tweaks to Cagara's CountPrivateBandwidth patch:Nick Mathewson
- 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-05Patch from cagara: Add a CountPrivateBandwidth flagDaniel Cagara
2011-04-04remove duplicate changes file for 2702Nick Mathewson
2011-04-04Merge branch 'static-work'Nick Mathewson
2011-04-04Changes file for static-work branchNick Mathewson
2011-04-04Merge branch 'maint-0.2.2'Roger Dingledine
2011-04-04Merge branch 'maint-0.2.1' into maint-0.2.2Roger Dingledine
2011-04-04switch to the apr 2011 geoip dbRoger Dingledine
2011-04-02Small fixes for the 2702 implementationSebastian Hahn
Improve the INSTALL documentation for static builds, remove a few unnecessary lines from configure.in and tweak the changelog message slightly.
2011-04-02add --enable-static-tor to our configure scriptJacob Appelbaum
This implements the feature request in bug #2702
2011-03-30Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson
Conflicts: src/common/compat.h src/or/circuitlist.c src/or/circuituse.c src/or/or.h src/or/rephist.c
2011-03-30Use cbt to tell when to launch parallel intro circuitNick Mathewson
Implement feature from trac #2799
2011-03-30Use timevals, not time_t, when expiring circuits.Nick Mathewson
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-30Implement replacements for timer(add,cmp,sub) on platforms lacking them.Nick Mathewson
2011-03-28Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2Nick Mathewson
2011-03-28Fix configure.in zlib package names.Erinn Clark
2011-03-28Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson
2011-03-27Small tweaks for bug2698 bugfixSebastian Hahn
2011-03-27Fix libevent autoconf bug #2698Jacob Appelbaum
2011-03-18Merge remote branch 'origin/maint-0.2.2'Nick Mathewson
Trivial Conflicts: configure.in
2011-03-18Fix signed/unsigned compare warningNick Mathewson
2011-03-18Merge remote branch 'sebastian/bug2696' into maint-0.2.2Nick Mathewson
2011-03-18Add 2696 changes fileSebastian Hahn
2011-03-18Remove superfluous -g -O2 compiler argumentSebastian Hahn
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-17Futz with the clang patch a bit and tidy some geoip.c stuffNick Mathewson
2011-03-16Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson
2011-03-16Document a few more members.Nick Mathewson
2011-03-16Resolve the one DOCDOC in the 0.2.2 code atmNick Mathewson
2011-03-16Remove a useless doxygen commentNick Mathewson
2011-03-16Move the decl for tor_gettimofday_cache_clear to the right headerNick Mathewson
2011-03-16Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson
Conflicts: src/common/crypto.c
2011-03-16add changes file for the doxygen issuesNick Mathewson
2011-03-16Clean up whitespaceNick Mathewson
2011-03-16Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson
Trivial Conflicts in src/common/crypto.c src/or/main.h src/or/or.h
2011-03-16Doxygen documentation for about 100 things that didn't have anyNick Mathewson
About 860 doxygen-less things remain in 0.2.2
2011-03-16Fix up all doxygen warnings other than "foo is not documented"Nick Mathewson
2011-03-16Turn on the "source browser" feature for our generated HTML.Nick Mathewson
2011-03-16Run "doxygen -u" to update doxygen config file.Nick Mathewson
2011-03-15Merge remote branch 'arma/optimistic_server'Nick Mathewson
2011-03-15Merge remote branch 'origin/maint-0.2.2'Nick Mathewson
2011-03-15Merge branch 'bug2756_relay' into maint-0.2.2Nick Mathewson
7apu2bq3rhoylwmucxizk54afw5jyda7pho4j5zdcqpwkufke7zdzwad.onion