aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Drop MAX_REND_FAILURES to 8Nick Mathewson2014-04-02
|
* Merge remote-tracking branch 'public/bug11278'Nick Mathewson2014-04-01
|\
| * Free placeholder circid/chan->circuit map entries on exitNick Mathewson2014-03-25
| | | | | | | | | | | | | | | | | | In circuitlist_free_all, we free all the circuits, removing them from the map as we go, but we weren't actually freeing the placeholder entries that we use to indicate pending DESTROY cells. Fix for bug 11278; bugfix on the 7912 code that was merged in 0.2.5.1-alpha
* | Merge remote-tracking branch 'public/bug10468_024'Nick Mathewson2014-04-01
|\ \
| * | Respond to AAAA requests on DNSPort with AAAA automapsNick Mathewson2014-03-27
| | | | | | | | | | | | | | | | | | | | | Other DNS+IPv6 problems remain, but at least this fixes the automapping. Fixes bug 10468; bugfix on 0.2.4.7-alpha.
* | | Merge remote-tracking branch 'public/bug4645'Nick Mathewson2014-04-01
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: src/or/dirserv.c
| * | | Add one more missing heck on bug4645 fixesNick Mathewson2014-04-01
| | | |
| * | | Fixes for bug4645 fix.Nick Mathewson2014-02-03
| | | |
| * | | Using proper functions to create tor_addr_t.rl19872014-02-03
| | | |
| * | | Removing is_internal_IP() function. Resolves ticket 4645.rl19872014-02-03
| | | |
* | | | Merge remote-tracking branch 'origin/maint-0.2.4'Nick Mathewson2014-04-01
|\ \ \ \
| * \ \ \ Merge branch 'bug9213_doc_024' into maint-0.2.4Nick Mathewson2014-04-01
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Fix documentation of torrc search orderNick Mathewson2014-04-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We are searching @CONFDIR@ before $HOME, but the documentation implied otherwise. I screwed this up in f5e86bcd6c06d43ff3af5acd8135bd8b577bc3, when I first documented the $HOME/.torrc possibility. Fix for bug 9213; bugfix on 0.2.3.18-rc.
* | | | | Merge remote-tracking branch 'public/bug9870'Nick Mathewson2014-04-01
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/or/config.c
| * | | | | Log only one message for dangerous log settings.Nick Mathewson2014-02-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We log only one message, containing a complete list of what's wrong. We log the complete list whenever any of the possible things that could have gotten wrong gets worse. Fix for #9870. Bugfix on 10480dff01bece13fab, which we merged in 0.2.5.1-alpha.
* | | | | | Merge remote-tracking branch 'public/bug11232'Nick Mathewson2014-04-01
|\ \ \ \ \ \
| * | | | | | changes file for bug11232Nick Mathewson2014-03-18
| | | | | | |
| * | | | | | Fix a ubsan warning in addr_mask_get_bitsNick Mathewson2014-03-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ubsan doesn't like us to do (1u<<32) when 32 is wider than unsigned. Fortunately, we already special-case addr_mask_get_bits(0), so we can just change the loop bounds.
| * | | | | | Fix a ubsan warning in our ctypes replacementsNick Mathewson2014-03-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ubsan doesn't like 1<<31, since that's an undefined integer overflow. Instead, we should do 1u<<31.
| * | | | | | csiphash: don't attempt unaligned accessNick Mathewson2014-03-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In digestmap_set/get benchmarks, doing unaligned access on x86 doesn't save more than a percent or so in the fast case. In the slow case (where we cross a cache line), it could be pretty expensive. It also makes ubsan unhappy.
| * | | | | | memarea.c: use flexible array member for memNick Mathewson2014-03-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This make clang's memory sanitizer happier that we aren't reading off the end of a char[1]. We hadn't replaced the char[1] with a char[FLEXIBLE_ARRAY_MEMBER] before because we were doing a union trick to force alignment. Now we use __attribute__(aligned) where available, and we do the union trick elsewhere. Most of this patch is just replacing accesses to (x)->u.mem with (x)->U_MEM, where U_MEM is defined as "u.mem" or "mem" depending on our implementation.
| * | | | | | Fix a use-after-free in test_circuitlist.cNick Mathewson2014-03-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Found by clang-3.4 analyzers.
* | | | | | | Merge branch 'bug8787_squashed'Nick Mathewson2014-03-31
|\ \ \ \ \ \ \
| * | | | | | | changes file for bug8787Nick Mathewson2014-03-31
| | | | | | | |
| * | | | | | | Munmap the right pointers in routerlist_free()Nick Mathewson2014-03-31
| | | | | | | |
| * | | | | | | NULL out all mappings after tor_munmap_file()Nick Mathewson2014-03-31
| | | | | | | |
| * | | | | | | Check return values for tor_munmap_file() in unit testsNick Mathewson2014-03-31
| | | | | | | |
| * | | | | | | Handle tor_munmap_file(NULL) consistentlyNick Mathewson2014-03-31
| | | | | | | |
| * | | | | | | Check strftime() return in tortls.cAndrea Shepard2014-03-31
| | | | | | | |
| * | | | | | | Eliminate lseek() with unchecked return in tor_mmap_file()Andrea Shepard2014-03-31
| | | | | | | |
| * | | | | | | Always check returns from unlink()Andrea Shepard2014-03-31
| | | | | | | |
| * | | | | | | Always check returns from tor_munmap_file() in microdesc.cAndrea Shepard2014-03-31
| | | | | | | |
| * | | | | | | Always check returns from tor_munmap_file() in routerlist.cAndrea Shepard2014-03-31
| | | | | | | |
| * | | | | | | Add return value and assert for null parameter to tor_munmap_file()Andrea Shepard2014-03-31
| | | | | | | |
* | | | | | | | Merge remote-tracking branch 'public/build_torrify_manpage_again'Nick Mathewson2014-03-31
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix build of torify.1Nick Mathewson2014-03-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The build was broken by changes in f8c45339f72525c68, but we didn't notice, since that commit also made torify.1 only get built when tor-fw-helper was turned on. Fixes bug 11321; bugfix on Tor 0.2.5.1-alpha.
* | | | | | | | | Merge remote-tracking branch 'public/bug11342'Nick Mathewson2014-03-31
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Make dump_desc() use binary modeNick Mathewson2014-03-27
| | |_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise, it could mung the thing that came over the net on windows, which would defeat the purpose of recording the unparseable thing. Fixes bug 11342; bugfix on 0.2.2.1-alpha.
* | | | | | | | | Fix a clang compilation warningNick Mathewson2014-03-31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Subtracting two time_t values was yielding something that maybe can't be fit in an int. Bugfix on 0389d4aa; bug not in any released Tor.
* | | | | | | | | Merge branch 'bug9658_refactor'Nick Mathewson2014-03-27
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Renamed "onionskins_completed" to "onionskins_assigned"Nick Mathewson2014-03-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This improves the accuracy of the function/variable names.
* | | | | | | | | | Merge remote-tracking branch 'origin/maint-0.2.4'Nick Mathewson2014-03-27
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | |
| * | | | | | | | | whitespace fixNick Mathewson2014-03-27
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'bug7164_diagnose_harder_v2'Nick Mathewson2014-03-27
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | More logs to try to diagnose bug 7164Nick Mathewson2014-03-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This time, check in microdesc_cache_clean() to see what could be going wrong with an attempt to clean a microdesc that's held by a node.
* | | | | | | | | Fix version number in changes/bug11296Nick Mathewson2014-03-26
| |_|/ / / / / / |/| | | | | | |
* | | | | | | | Merge remote-tracking branch 'public/bug11296'Nick Mathewson2014-03-26
|\ \ \ \ \ \ \ \
| * | | | | | | | Add missing -Isrc/ext to tor-fw-helper/include.amNick Mathewson2014-03-25
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need this now that tor-fw-helper will pull in siphash.h Fixes bug 11296; bugfix on 0.2.5.4-alpha where siphash.h was introduced.
* | | | | | | | Turn off testing code for #9683.Nick Mathewson2014-03-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (This wasn't supposed to get committed turned-on.)
* | | | | | | | Demote "Invalid length on ESTABLISH_RENDEZVOUS" to protocol_warnNick Mathewson2014-03-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 11279