summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
* | | | | | | | Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson2011-04-07
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Allow controllers a more up-to-date view of bridge usage.Nick Mathewson2011-04-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson2011-04-07
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Fix a compile warning on OS X 10.6Sebastian Hahn2011-04-07
| | | | | | | |
* | | | | | | | Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson2011-04-06
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge maint-0.2.1 for bug2402_again fixes . Use "-s ours" so we don't ↵Nick Mathewson2011-04-06
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | | | | | | | | actually take the patch.
| | * | | | | | Merge remote-tracking branch 'public/bug2402_again' into maint-0.2.1Nick Mathewson2011-04-06
| | |\ \ \ \ \ \
| | | * | | | | | Backport: Generate version tags using Git, not (broken) svn revisions.Nick Mathewson2011-03-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Partial backport of daa0326aaaa85a760be94ee2360cfa61a9fb5be2 . Resolves bug 2402. Bugfix on 0.2.1.15 (for the part where we switched to git) and on 0.2.1.30 (for the part where we dumped micro-revisions.)
| | | * | | | | | Revert "Simplest fix to bug2402: do not include SVN versions"Nick Mathewson2011-03-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit a1073ee956021ead19d30c2151510dbaced416a8. Apparently, we totally misunderstood how the debian packages were using microrevisions. Better fix that!
* | | | | | | | | Merge remote-tracking branch 'public/bug2381'Nick Mathewson2011-04-06
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix infinite recursion when connect() fails in microdesc consensus fetchNick Mathewson2011-02-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The underlying fix is to stop indicating requests "ns" consensuses by putting NULL in their requested_resource field: we already had a specialized meaning for requested_resource==NULL, which was (more or less) "Treat a failure here as a network failure, since it's too early to possibly be a resource or directory failure." Overloading the two meant that very early microdesc consensus download failures would get treated as ns consensus download failures, so the failure count there would get incremented, but the microdesc download would get retried immediately in an infinite loop. Fix for bug2381. Diagnosed by mobmix.
* | | | | | | | | | Add a missing ! to the check for CountPrivatebandwidth.Nick Mathewson2011-04-06
| | | | | | | | | |
* | | | | | | | | | Tweaks to Cagara's CountPrivateBandwidth patch:Nick Mathewson2011-04-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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.
* | | | | | | | | | Patch from cagara: Add a CountPrivateBandwidth flagDaniel Cagara2011-04-05
| | | | | | | | | |
* | | | | | | | | | remove duplicate changes file for 2702Nick Mathewson2011-04-04
| | | | | | | | | |
* | | | | | | | | | Merge branch 'static-work'Nick Mathewson2011-04-04
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Changes file for static-work branchNick Mathewson2011-04-04
| | | | | | | | | | |
| * | | | | | | | | | Small fixes for the 2702 implementationSebastian Hahn2011-04-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve the INSTALL documentation for static builds, remove a few unnecessary lines from configure.in and tweak the changelog message slightly.
| * | | | | | | | | | add --enable-static-tor to our configure scriptJacob Appelbaum2011-04-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This implements the feature request in bug #2702
* | | | | | | | | | | Merge branch 'maint-0.2.2'Roger Dingledine2011-04-04
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | / / / / / / / / | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge branch 'maint-0.2.1' into maint-0.2.2Roger Dingledine2011-04-04
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | * | | | | | | | switch to the apr 2011 geoip dbRoger Dingledine2011-04-04
| | | | | | | | | |
* | | | | | | | | | Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson2011-03-30
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/common/compat.h src/or/circuitlist.c src/or/circuituse.c src/or/or.h src/or/rephist.c
| * | | | | | | | | Use cbt to tell when to launch parallel intro circuitNick Mathewson2011-03-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement feature from trac #2799
| * | | | | | | | | Use timevals, not time_t, when expiring circuits.Nick Mathewson2011-03-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | | | | Implement replacements for timer(add,cmp,sub) on platforms lacking them.Nick Mathewson2011-03-30
| | | | | | | | | |
| * | | | | | | | | Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2Nick Mathewson2011-03-28
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Fix configure.in zlib package names.Erinn Clark2011-03-28
| | | | | | | | | |
* | | | | | | | | | Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson2011-03-28
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Small tweaks for bug2698 bugfixSebastian Hahn2011-03-27
| | | | | | | | | |
| * | | | | | | | | Fix libevent autoconf bug #2698Jacob Appelbaum2011-03-27
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge remote branch 'origin/maint-0.2.2'Nick Mathewson2011-03-18
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | / / / / | |_|_|_|/ / / / |/| | | | | | | Trivial Conflicts: configure.in
| * | | | | | | Fix signed/unsigned compare warningNick Mathewson2011-03-18
| | | | | | | |
| * | | | | | | Merge remote branch 'sebastian/bug2696' into maint-0.2.2Nick Mathewson2011-03-18
| |\ \ \ \ \ \ \
| | * | | | | | | Add 2696 changes fileSebastian Hahn2011-03-18
| | | | | | | | |
| | * | | | | | | Remove superfluous -g -O2 compiler argumentSebastian Hahn2011-03-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * | | | | | | Futz with the clang patch a bit and tidy some geoip.c stuffNick Mathewson2011-03-17
| | | | | | | | |
| | * | | | | | | Fix compilation under LLVM/clang with --enable-gcc-warningsSteven Murdoch2011-03-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - When compiling using clang (2.9 or lower) do not enable -Wnormalized=id or -Woverride-init when --enable-gcc-warnings or --enable-gcc-warnings-advisory is set as these options are unsupported.
| | * | | | | | | Fix two compile warnings when using clangSebastian Hahn2011-03-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue found by Steven Murdoch
* | | | | | | | | Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson2011-03-16
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Document a few more members.Nick Mathewson2011-03-16
| | | | | | | | |
| * | | | | | | | Resolve the one DOCDOC in the 0.2.2 code atmNick Mathewson2011-03-16
| | | | | | | | |
| * | | | | | | | Remove a useless doxygen commentNick Mathewson2011-03-16
| | | | | | | | |
| * | | | | | | | Move the decl for tor_gettimofday_cache_clear to the right headerNick Mathewson2011-03-16
| | | | | | | | |
* | | | | | | | | Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson2011-03-16
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/common/crypto.c
| * | | | | | | | add changes file for the doxygen issuesNick Mathewson2011-03-16
| | | | | | | | |
| * | | | | | | | Clean up whitespaceNick Mathewson2011-03-16
| | | | | | | | |
* | | | | | | | | Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson2011-03-16
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Trivial Conflicts in src/common/crypto.c src/or/main.h src/or/or.h
| * | | | | | | | Doxygen documentation for about 100 things that didn't have anyNick Mathewson2011-03-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | About 860 doxygen-less things remain in 0.2.2
| * | | | | | | | Fix up all doxygen warnings other than "foo is not documented"Nick Mathewson2011-03-16
| | | | | | | | |
generated by cgit v1.2.1 (git 2.18.0) at 2024-02-08 08:01:35 +0000