summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-10-31Move #9731 checks to start of their functionsNick Mathewson
At arma's suggestion.
2013-10-31Merge remote-tracking branch 'public/bug9731'Nick Mathewson
2013-10-31Merge remote-tracking branch 'origin/maint-0.2.4'Nick Mathewson
Do an "ours" merge to not take the 0.2.4 fix for #9731
2013-10-31Merge remote-tracking branch 'public/bug9731b' into maint-0.2.4Nick Mathewson
2013-10-31Merge remote-tracking branch 'origin/maint-0.2.4'Nick Mathewson
2013-10-31Merge remote-tracking branch 'public/bug9780_024_v2' into maint-0.2.4Nick Mathewson
2013-10-31Merge remote-tracking branch 'origin/maint-0.2.4'Nick Mathewson
2013-10-31Merge remote-tracking branch 'public/bug6055_v2_024' into maint-0.2.4Nick Mathewson
2013-10-31Only use -Wlogical-op with GCC 4.6 and laterNick Mathewson
It generates an apparently spurious warning with gcc 4.4 in debian; we haven't tested 4.5.
2013-10-31Mention that tor is client-by-default. From Weasel. Resolves #10057Nick Mathewson
2013-10-31Minor manpage tweaks from weasel; closes #10058Nick Mathewson
2013-10-31Add changelog entry for merged #7359.Karsten Loesing
2013-10-30Add some clarity and checks to cell_queue_append_packed_copyNick Mathewson
It's not cool to have "circ may be NULL if use_stats false, but otherwise we crash" as an undocumented API constraint. :)
2013-10-30Merge remote-tracking branch 'karsten/morestats5'Nick Mathewson
2013-10-30Add the -Wlogical-op switch when building with GCC 4.3 or later.Nick Mathewson
2013-10-29Fix an always-true assert in PT code.George Kadianakis
2013-10-29Merge remote-tracking branch 'public/bug5018'Nick Mathewson
Conflicts: src/or/entrynodes.c
2013-10-29Document that unneeded transports are ignored.David Fifield
Suggested by Roger in https://trac.torproject.org/projects/tor/ticket/5018#comment:11.
2013-10-29Simplify transport_is_needed.David Fifield
By Roger at https://trac.torproject.org/projects/tor/ticket/5018#comment:11.
2013-10-29Only launch transport proxies that provide useful transports.George Kadianakis
2013-10-28Merge branch 'morestats4' into morestats5Karsten Loesing
Conflicts: doc/tor.1.txt src/or/config.c src/or/connection.h src/or/control.c src/or/control.h src/or/or.h src/or/relay.c src/or/relay.h src/test/test.c
2013-10-28squash! Pass const uint64_t pointers, document array length.Karsten Loesing
Don't cast uint64_t * to const uint64_t * explicitly. The cast is always safe, so C does it for us. Doing the cast explitictly can hide bugs if the input is secretly the wrong type. Suggested by Nick.
2013-10-25clarify that DisableNetwork closes connections tooRoger Dingledine
2013-10-25Merge remote-tracking branch 'public/bug9934_nm'Nick Mathewson
2013-10-25Tweak 5605 changes fileNick Mathewson
2013-10-25Merge remote-tracking branch 'Ryman/bug5605'Nick Mathewson
2013-10-25Log the origin address of controller connectionsNick Mathewson
Resolves 9698; patch from "sigpipe".
2013-10-21Make test_cmdline_args.py work with older pythonsNick Mathewson
I was using the assertIn() function on unit tests, which Python 2.7 introduced. But we'd like to be able to run our unit tests on Pythons from older operating systems.
2013-10-21Better detection for certain broken cross-compiling situations.Nick Mathewson
Fixes bug 9869; patch from Benedikt Gollatz.
2013-10-21Give a better warning when stack protection breaks linking.Nick Mathewson
Fix for 9948; patch from Benedikt Gollatz.
2013-10-21DROPGUARDS controller commandNick Mathewson
Implements ticket 9934; patch from "ra"
2013-10-16Merge remote-tracking branch 'linus/bug9206_option'Nick Mathewson
2013-10-14changes file for bug9651Nick Mathewson
2013-10-14Merge remote-tracking branch 'asn/bug9651'Nick Mathewson
2013-10-12Merge branch 'maint-0.2.4'Roger Dingledine
2013-10-12be willing to bootstrap from all three of our directory guardsRoger Dingledine
Also fix a bug where if the guard we choose first doesn't answer, we would try the second guard, but once we connected to the second guard we would abandon it and retry the first one, slowing down bootstrapping. The fix in both cases is to treat all our initially chosen guards as acceptable to use. Fixes bug 9946.
2013-10-11Fix out-of-tree "make check-local"Nick Mathewson
2013-10-11When possible, run the ntor python integration tests tooNick Mathewson
2013-10-11When python is available, run the commandline unit tests from "make check"Nick Mathewson
2013-10-11Merge branch 'bug1376'Nick Mathewson
2013-10-11Fix some whitespace; tighten the tests.Nick Mathewson
2013-10-11Make --version, --help, etc incremement quiet level, never decrease itNick Mathewson
Fixes other case of #9578
2013-10-11Merge remote-tracking branch 'karsten/geoip-manual-update-oct2013'Nick Mathewson
2013-10-11Merge remote-tracking branch 'origin/maint-0.2.4'Nick Mathewson
2013-10-11Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4Nick Mathewson
2013-10-11Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3Nick Mathewson
2013-10-11Update to the October 2013 GeoIP database.maint-0.2.2Karsten Loesing
2013-10-11Modify 1 and delete 1 geoip A1 substitution.Karsten Loesing
2013-10-10Report bootstrapping progress correctly when downloading microdescsRoger Dingledine
We had updated our "do we have enough microdescs to begin building circuits?" logic most recently in 0.2.4.10-alpha (see bug 5956), but we left the bootstrap status event logic at "how far through getting 1/4 of them are we?" Fixes bug 9958; bugfix on 0.2.2.36, which is where they diverged (see bug 5343).
2013-10-10Merge branch 'maint-0.2.4'Roger Dingledine
7apu2bq3rhoylwmucxizk54afw5jyda7pho4j5zdcqpwkufke7zdzwad.onion