commit d2105ff5d530544538f6e98c1fba4d117223d12d Merge: 57b207efa 8ef4bb7f3 Author: teor teor@torproject.org Date: Fri Sep 7 13:00:34 2018 +1000

Merge branch 'bug27461-029' into bug27461-032

Fix a minor merge conflict due to an #endif comment.

changes/bug27461 | 5 +++++ src/or/main.c | 8 ++++++++ 2 files changed, 13 insertions(+)

diff --cc src/or/main.c index 66b592098,55bcb18c4..6c32ee5d8 --- a/src/or/main.c +++ b/src/or/main.c @@@ -3732,7 -3453,8 +3739,8 @@@ tor_main(int argc, char *argv[] setdeppolicy(3); } } + #endif /* !defined(_WIN64) */ -#endif +#endif /* defined(_WIN32) */

configure_backtrace_handler(get_version());