diff options
| author | Nick Mathewson <nickm@torproject.org> | 2010-11-24 17:06:26 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2010-11-24 17:06:26 -0500 |
| commit | ae6b31aba93cabb5c3a4ee3b03da282fde797282 (patch) | |
| tree | 2b102ea8148e3dff27ccfab373f1abcd66a06a95 /src/or/router.c | |
| parent | d77bc69b0cd1fe6886929d5d575180ac195906ed (diff) | |
| parent | 251b40f720d374918c4f453c73c2f59162757795 (diff) | |
| download | tor-ae6b31aba93cabb5c3a4ee3b03da282fde797282.tar.gz tor-ae6b31aba93cabb5c3a4ee3b03da282fde797282.zip | |
Merge remote branch 'origin/maint-0.2.2'
Conflicts:
configure.in
contrib/tor-mingw.nsi.in
src/win32/orconfig.h
Diffstat (limited to 'src/or/router.c')
| -rw-r--r-- | src/or/router.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/router.c b/src/or/router.c index 5fbc9be342..1f3967d3d5 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -1524,7 +1524,7 @@ router_rebuild_descriptor(int force) /* Let bridges serve their own descriptors unencrypted, so they can * pass reachability testing. (If they want to be harder to notice, * they can always leave the DirPort off). */ - if (!options->BridgeRelay) + if (ei && !options->BridgeRelay) ei->cache_info.send_unencrypted = 1; router_get_router_hash(ri->cache_info.signed_descriptor_body, |